postgres.git / summary / log / commit / refs

commit    da53e4f93fb3a03f6d5a7d4b98135361fae2ade0
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Fri May 31 16:34:55 2019 +0000

    Fix C++ incompatibilities in plpgsql's header files.
    
    Rename some exposed parameters so that they don't conflict with
    C++ reserved words.
    
    Back-patch to all supported versions.
    
    George Tarasov
    
    Discussion: https://postgr.es/m/b517ec3918d645eb950505eac8dd434e@gaz-is.ru


 src/pl/plpgsql/src/plpgsql.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pl/plpgsql/src/plpgsql.h b/src/pl/plpgsql/src/plpgsql.h
index bc70e1b1f54..92887caed36 100644
--- a/src/pl/plpgsql/src/plpgsql.h
+++ b/src/pl/plpgsql/src/plpgsql.h
@@ -957,7 +957,7 @@ extern PLpgSQL_rec *plpgsql_build_record(const char *refname, int lineno,
 extern int plpgsql_recognize_err_condition(const char *condname,
 								bool allow_sqlstate);
 extern PLpgSQL_condition *plpgsql_parse_err_condition(char *condname);
-extern void plpgsql_adddatum(PLpgSQL_datum *new);
+extern void plpgsql_adddatum(PLpgSQL_datum *newdatum);
 extern int	plpgsql_add_initdatums(int **varnos);
 extern void plpgsql_HashTableInit(void);
 
@@ -985,7 +985,7 @@ extern Oid exec_get_datum_type(PLpgSQL_execstate *estate,
 					PLpgSQL_datum *datum);
 extern void exec_get_datum_type_info(PLpgSQL_execstate *estate,
 						 PLpgSQL_datum *datum,
-						 Oid *typeid, int32 *typmod, Oid *collation);
+						 Oid *typeId, int32 *typMod, Oid *collation);
 
 /* ----------
  * Functions for namespace handling in pl_funcs.c


[parent: d759ddaaf4b9]