Skip to content

Commit dd6fcd3

Browse files
committed
Change typedef for rb_appendator to avoid conflict with C++ reserved words.
Fixes a complaint from src/tools/pginclude/cpluspluscheck reported by Peter Eisentraut.
1 parent 4a69624 commit dd6fcd3

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/include/utils/rbtree.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Copyright (c) 1996-2009, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
9-
* $PostgreSQL: pgsql/src/include/utils/rbtree.h,v 1.2 2010/02/26 02:01:29 momjian Exp $
9+
* $PostgreSQL: pgsql/src/include/utils/rbtree.h,v 1.3 2010/05/11 18:14:01 rhaas Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -18,7 +18,7 @@ typedef struct RBTree RBTree;
1818
typedef struct RBTreeIterator RBTreeIterator;
1919

2020
typedef int (*rb_comparator) (const void *a, const void *b, void *arg);
21-
typedef void *(*rb_appendator) (void *current, void *new, void *arg);
21+
typedef void *(*rb_appendator) (void *currentdata, void *newval, void *arg);
2222
typedef void (*rb_freefunc) (void *a);
2323

2424
extern RBTree *rb_create(rb_comparator comparator,

0 commit comments

Comments
 (0)