diff options
| author | Robert Haas | 2010-05-11 18:14:01 +0000 |
|---|---|---|
| committer | Robert Haas | 2010-05-11 18:14:01 +0000 |
| commit | dd6fcd35e33fa19144ceb69292c497b1f7b61388 (patch) | |
| tree | fc8ea9329e9f06732b952c20c6b147819c519f48 | |
| parent | 4a69624f495363810371a9178b0c5a5f5336e70e (diff) | |
Change typedef for rb_appendator to avoid conflict with C++ reserved words.
Fixes a complaint from src/tools/pginclude/cpluspluscheck reported by
Peter Eisentraut.
| -rw-r--r-- | src/include/utils/rbtree.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/include/utils/rbtree.h b/src/include/utils/rbtree.h index bf6daa5aafd..77abff8cf86 100644 --- a/src/include/utils/rbtree.h +++ b/src/include/utils/rbtree.h @@ -6,7 +6,7 @@ * Copyright (c) 1996-2009, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/include/utils/rbtree.h,v 1.2 2010/02/26 02:01:29 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/rbtree.h,v 1.3 2010/05/11 18:14:01 rhaas Exp $ * *------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ typedef struct RBTree RBTree; typedef struct RBTreeIterator RBTreeIterator; typedef int (*rb_comparator) (const void *a, const void *b, void *arg); -typedef void *(*rb_appendator) (void *current, void *new, void *arg); +typedef void *(*rb_appendator) (void *currentdata, void *newval, void *arg); typedef void (*rb_freefunc) (void *a); extern RBTree *rb_create(rb_comparator comparator, |