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

tglsfdc · tglsfdc · commit 3f61b3205f1a · 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
@@ -2212,16 +2212,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
@@ -5583,7 +5583,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)
 	{
@@ -5592,8 +5592,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;
 			}
@@ -5605,15 +5605,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;
@@ -5651,16 +5651,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
@@ -1239,7 +1239,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);
 
@@ -1266,7 +1266,8 @@ 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
`@@ -2212,16 +2212,16 @@ plpgsql_start_datums(void)`
`2212`	`2212`	`* ----------`
`2213`	`2213`	`*/`
`2214`	`2214`	`void`
`2215`		`-plpgsql_adddatum(PLpgSQL_datum *new)`
	`2215`	`+plpgsql_adddatum(PLpgSQL_datum *newdatum)`
`2216`	`2216`	`{`
`2217`	`2217`	`if (plpgsql_nDatums == datums_alloc)`
`2218`	`2218`	`{`
`2219`	`2219`	`datums_alloc *= 2;`
`2220`	`2220`	`plpgsql_Datums = repalloc(plpgsql_Datums, sizeof(PLpgSQL_datum ) datums_alloc);`
`2221`	`2221`	`}`
`2222`	`2222`
`2223`		`- new->dno = plpgsql_nDatums;`
`2224`		`- plpgsql_Datums[plpgsql_nDatums++] = new;`
	`2223`	`+ newdatum->dno = plpgsql_nDatums;`
	`2224`	`+ plpgsql_Datums[plpgsql_nDatums++] = newdatum;`
`2225`	`2225`	`}`
`2226`	`2226`
`2227`	`2227`	`/* ----------`
Original file line number	Diff line number	Diff line change
`@@ -5583,7 +5583,7 @@ plpgsql_exec_get_datum_type(PLpgSQL_execstate *estate,`
`5583`	`5583`	`void`
`5584`	`5584`	`plpgsql_exec_get_datum_type_info(PLpgSQL_execstate *estate,`
`5585`	`5585`	`PLpgSQL_datum *datum,`
`5586`		`- Oid typeid, int32 typmod, Oid *collation)`
	`5586`	`+ Oid typeId, int32 typMod, Oid *collation)`
`5587`	`5587`	`{`
`5588`	`5588`	`switch (datum->dtype)`
`5589`	`5589`	`{`
`@@ -5592,8 +5592,8 @@ plpgsql_exec_get_datum_type_info(PLpgSQL_execstate *estate,`
`5592`	`5592`	`{`
`5593`	`5593`	`PLpgSQL_var var = (PLpgSQL_var ) datum;`
`5594`	`5594`
`5595`		`- *typeid = var->datatype->typoid;`
`5596`		`- *typmod = var->datatype->atttypmod;`
	`5595`	`+ *typeId = var->datatype->typoid;`
	`5596`	`+ *typMod = var->datatype->atttypmod;`
`5597`	`5597`	`*collation = var->datatype->collation;`
`5598`	`5598`	`break;`
`5599`	`5599`	`}`
`@@ -5605,15 +5605,15 @@ plpgsql_exec_get_datum_type_info(PLpgSQL_execstate *estate,`
`5605`	`5605`	`if (rec->erh == NULL \|\| rec->rectypeid != RECORDOID)`
`5606`	`5606`	`{`
`5607`	`5607`	`/* Report variable's declared type */`
`5608`		`- *typeid = rec->rectypeid;`
`5609`		`- *typmod = -1;`
	`5608`	`+ *typeId = rec->rectypeid;`
	`5609`	`+ *typMod = -1;`
`5610`	`5610`	`}`
`5611`	`5611`	`else`
`5612`	`5612`	`{`
`5613`	`5613`	`/* Report record's actual type if declared RECORD */`
`5614`		`- *typeid = rec->erh->er_typeid;`
	`5614`	`+ *typeId = rec->erh->er_typeid;`
`5615`	`5615`	`/* do NOT return the mutable typmod of a RECORD variable */`
`5616`		`- *typmod = -1;`
	`5616`	`+ *typMod = -1;`
`5617`	`5617`	`}`
`5618`	`5618`	`/* composite types are never collatable */`
`5619`	`5619`	`*collation = InvalidOid;`
`@@ -5651,16 +5651,16 @@ plpgsql_exec_get_datum_type_info(PLpgSQL_execstate *estate,`
`5651`	`5651`	`recfield->rectupledescid = rec->erh->er_tupdesc_id;`
`5652`	`5652`	`}`
`5653`	`5653`
`5654`		`- *typeid = recfield->finfo.ftypeid;`
`5655`		`- *typmod = recfield->finfo.ftypmod;`
	`5654`	`+ *typeId = recfield->finfo.ftypeid;`
	`5655`	`+ *typMod = recfield->finfo.ftypmod;`
`5656`	`5656`	`*collation = recfield->finfo.fcollation;`
`5657`	`5657`	`break;`
`5658`	`5658`	`}`
`5659`	`5659`
`5660`	`5660`	`default:`
`5661`	`5661`	`elog(ERROR, "unrecognized dtype: %d", datum->dtype);`
`5662`		`- typeid = InvalidOid; / keep compiler quiet */`
`5663`		`- *typmod = -1;`
	`5662`	`+ typeId = InvalidOid; / keep compiler quiet */`
	`5663`	`+ *typMod = -1;`
`5664`	`5664`	`*collation = InvalidOid;`
`5665`	`5665`	`break;`
`5666`	`5666`	`}`