From dd6fcd35e33fa19144ceb69292c497b1f7b61388 Mon Sep 17 00:00:00 2001
From: Robert Haas <rhaas@postgresql.org>
Date: Tue, 11 May 2010 18:14:01 +0000
Subject: [PATCH] Change typedef for rb_appendator to avoid conflict with C++
 reserved words.

Fixes a complaint from src/tools/pginclude/cpluspluscheck reported by
Peter Eisentraut.
---
 src/include/utils/rbtree.h | 4 ++--
 1 file 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,
-- 
GitLab