Fix C++ incompatibilities in plpgsql's header files.

tglsfdc · tglsfdc · commit 312017fcc46b · 2019-05-31T12:34:54.000-04:00
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
diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c
@@ -2203,16 +2203,16 @@ plpgsql_start_datums(void)
  * ----------
  */
 void
-plpgsql_adddatum(PLpgSQL_datum *new)
+plpgsql_adddatum(PLpgSQL_datum *newdatum)
 {
 	if (plpgsql_nDatums == datums_alloc)
 	{
 		datums_alloc *= 2;
 		plpgsql_Datums = repalloc(plpgsql_Datums, sizeof(PLpgSQL_datum *) * datums_alloc);
 	}
 
-	new->dno = plpgsql_nDatums;
-	plpgsql_Datums[plpgsql_nDatums++] = new;
+	newdatum->dno = plpgsql_nDatums;
+	plpgsql_Datums[plpgsql_nDatums++] = newdatum;
 }
 
 /* ----------
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
@@ -5552,7 +5552,7 @@ plpgsql_exec_get_datum_type(PLpgSQL_execstate *estate,
 void
 plpgsql_exec_get_datum_type_info(PLpgSQL_execstate *estate,
 								 PLpgSQL_datum *datum,
-								 Oid *typeid, int32 *typmod, Oid *collation)
+								 Oid *typeId, int32 *typMod, Oid *collation)
 {
 	switch (datum->dtype)
 	{
@@ -5561,8 +5561,8 @@ plpgsql_exec_get_datum_type_info(PLpgSQL_execstate *estate,
 			{
 				PLpgSQL_var *var = (PLpgSQL_var *) datum;
 
-				*typeid = var->datatype->typoid;
-				*typmod = var->datatype->atttypmod;
+				*typeId = var->datatype->typoid;
+				*typMod = var->datatype->atttypmod;
 				*collation = var->datatype->collation;
 				break;
 			}
@@ -5574,15 +5574,15 @@ plpgsql_exec_get_datum_type_info(PLpgSQL_execstate *estate,
 				if (rec->erh == NULL || rec->rectypeid != RECORDOID)
 				{
 					/* Report variable's declared type */
-					*typeid = rec->rectypeid;
-					*typmod = -1;
+					*typeId = rec->rectypeid;
+					*typMod = -1;
 				}
 				else
 				{
 					/* Report record's actual type if declared RECORD */
-					*typeid = rec->erh->er_typeid;
+					*typeId = rec->erh->er_typeid;
 					/* do NOT return the mutable typmod of a RECORD variable */
-					*typmod = -1;
+					*typMod = -1;
 				}
 				/* composite types are never collatable */
 				*collation = InvalidOid;
@@ -5620,16 +5620,16 @@ plpgsql_exec_get_datum_type_info(PLpgSQL_execstate *estate,
 					recfield->rectupledescid = rec->erh->er_tupdesc_id;
 				}
 
-				*typeid = recfield->finfo.ftypeid;
-				*typmod = recfield->finfo.ftypmod;
+				*typeId = recfield->finfo.ftypeid;
+				*typMod = recfield->finfo.ftypmod;
 				*collation = recfield->finfo.fcollation;
 				break;
 			}
 
 		default:
 			elog(ERROR, "unrecognized dtype: %d", datum->dtype);
-			*typeid = InvalidOid;	/* keep compiler quiet */
-			*typmod = -1;
+			*typeId = InvalidOid;	/* keep compiler quiet */
+			*typMod = -1;
 			*collation = InvalidOid;
 			break;
 	}
diff --git a/src/pl/plpgsql/src/plpgsql.h b/src/pl/plpgsql/src/plpgsql.h
@@ -1198,7 +1198,7 @@ extern PLpgSQL_recfield *plpgsql_build_recfield(PLpgSQL_rec *rec,
 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);
 
@@ -1225,7 +1225,7 @@ extern Oid plpgsql_exec_get_datum_type(PLpgSQL_execstate *estate,
 							PLpgSQL_datum *datum);
 extern void plpgsql_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

Original file line number	Diff line number	Diff line change
`@@ -2203,16 +2203,16 @@ plpgsql_start_datums(void)`
`2203`	`2203`	`* ----------`
`2204`	`2204`	`*/`
`2205`	`2205`	`void`
`2206`		`-plpgsql_adddatum(PLpgSQL_datum *new)`
	`2206`	`+plpgsql_adddatum(PLpgSQL_datum *newdatum)`
`2207`	`2207`	`{`
`2208`	`2208`	`if (plpgsql_nDatums == datums_alloc)`
`2209`	`2209`	`{`
`2210`	`2210`	`datums_alloc *= 2;`
`2211`	`2211`	`plpgsql_Datums = repalloc(plpgsql_Datums, sizeof(PLpgSQL_datum ) datums_alloc);`
`2212`	`2212`	`}`
`2213`	`2213`
`2214`		`- new->dno = plpgsql_nDatums;`
`2215`		`- plpgsql_Datums[plpgsql_nDatums++] = new;`
	`2214`	`+ newdatum->dno = plpgsql_nDatums;`
	`2215`	`+ plpgsql_Datums[plpgsql_nDatums++] = newdatum;`
`2216`	`2216`	`}`
`2217`	`2217`
`2218`	`2218`	`/* ----------`
Original file line number	Diff line number	Diff line change
`@@ -5552,7 +5552,7 @@ plpgsql_exec_get_datum_type(PLpgSQL_execstate *estate,`
`5552`	`5552`	`void`
`5553`	`5553`	`plpgsql_exec_get_datum_type_info(PLpgSQL_execstate *estate,`
`5554`	`5554`	`PLpgSQL_datum *datum,`
`5555`		`- Oid typeid, int32 typmod, Oid *collation)`
	`5555`	`+ Oid typeId, int32 typMod, Oid *collation)`
`5556`	`5556`	`{`
`5557`	`5557`	`switch (datum->dtype)`
`5558`	`5558`	`{`
`@@ -5561,8 +5561,8 @@ plpgsql_exec_get_datum_type_info(PLpgSQL_execstate *estate,`
`5561`	`5561`	`{`
`5562`	`5562`	`PLpgSQL_var var = (PLpgSQL_var ) datum;`
`5563`	`5563`
`5564`		`- *typeid = var->datatype->typoid;`
`5565`		`- *typmod = var->datatype->atttypmod;`
	`5564`	`+ *typeId = var->datatype->typoid;`
	`5565`	`+ *typMod = var->datatype->atttypmod;`
`5566`	`5566`	`*collation = var->datatype->collation;`
`5567`	`5567`	`break;`
`5568`	`5568`	`}`
`@@ -5574,15 +5574,15 @@ plpgsql_exec_get_datum_type_info(PLpgSQL_execstate *estate,`
`5574`	`5574`	`if (rec->erh == NULL \|\| rec->rectypeid != RECORDOID)`
`5575`	`5575`	`{`
`5576`	`5576`	`/* Report variable's declared type */`
`5577`		`- *typeid = rec->rectypeid;`
`5578`		`- *typmod = -1;`
	`5577`	`+ *typeId = rec->rectypeid;`
	`5578`	`+ *typMod = -1;`
`5579`	`5579`	`}`
`5580`	`5580`	`else`
`5581`	`5581`	`{`
`5582`	`5582`	`/* Report record's actual type if declared RECORD */`
`5583`		`- *typeid = rec->erh->er_typeid;`
	`5583`	`+ *typeId = rec->erh->er_typeid;`
`5584`	`5584`	`/* do NOT return the mutable typmod of a RECORD variable */`
`5585`		`- *typmod = -1;`
	`5585`	`+ *typMod = -1;`
`5586`	`5586`	`}`
`5587`	`5587`	`/* composite types are never collatable */`
`5588`	`5588`	`*collation = InvalidOid;`
`@@ -5620,16 +5620,16 @@ plpgsql_exec_get_datum_type_info(PLpgSQL_execstate *estate,`
`5620`	`5620`	`recfield->rectupledescid = rec->erh->er_tupdesc_id;`
`5621`	`5621`	`}`
`5622`	`5622`
`5623`		`- *typeid = recfield->finfo.ftypeid;`
`5624`		`- *typmod = recfield->finfo.ftypmod;`
	`5623`	`+ *typeId = recfield->finfo.ftypeid;`
	`5624`	`+ *typMod = recfield->finfo.ftypmod;`
`5625`	`5625`	`*collation = recfield->finfo.fcollation;`
`5626`	`5626`	`break;`
`5627`	`5627`	`}`
`5628`	`5628`
`5629`	`5629`	`default:`
`5630`	`5630`	`elog(ERROR, "unrecognized dtype: %d", datum->dtype);`
`5631`		`- typeid = InvalidOid; / keep compiler quiet */`
`5632`		`- *typmod = -1;`
	`5631`	`+ typeId = InvalidOid; / keep compiler quiet */`
	`5632`	`+ *typMod = -1;`
`5633`	`5633`	`*collation = InvalidOid;`
`5634`	`5634`	`break;`
`5635`	`5635`	`}`