Merge pull request #114 from NikitaFeodonit/master

Commit postgres/postgres@c456e39 added an assertion to the BlessTupleDesc
function requiring a call to the TupleDescFinalize function before calling
BlessTupleDesc. Add these calls; without them, the issue appears in the debug
build.

Also fix warnings -Wstrict-prototypes and -Wold-style-definition

Reported-by: Georgy Shelkovy <@RekGRpth>
Author: Nikita Kirin <@NikitaFeodonit>, Georgy Shelkovy <@RekGRpth>

Author: Medvecrab

collector.c

@@ -283,7 +283,7 @@ send_profile(HTAB *profile_hash, shm_mq_handle *mqh)
  * Make hash table for wait profile.
  */
 static HTAB *
-make_profile_hash()
+make_profile_hash(void)
 {
 	HASHCTL		hash_ctl;
 

pg_wait_sampling.c

@@ -524,7 +524,9 @@ pg_wait_sampling_get_current(PG_FUNCTION_ARGS)
 						   TEXTOID, -1, 0);
 		TupleDescInitEntry(tupdesc, (AttrNumber) 4, "queryid",
 						   INT8OID, -1, 0);
-
+#if PG_VERSION_NUM >= 190000
+		TupleDescFinalize(tupdesc);
+#endif
 		funcctx->tuple_desc = BlessTupleDesc(tupdesc);
 
 		LWLockAcquire(ProcArrayLock, LW_SHARED);
@@ -757,6 +759,9 @@ pg_wait_sampling_get_profile(PG_FUNCTION_ARGS)
 						   INT8OID, -1, 0);
 		TupleDescInitEntry(tupdesc, (AttrNumber) 5, "count",
 						   INT8OID, -1, 0);
+#if PG_VERSION_NUM >= 190000
+		TupleDescFinalize(tupdesc);
+#endif
 		funcctx->tuple_desc = BlessTupleDesc(tupdesc);
 
 		MemoryContextSwitchTo(oldcontext);
@@ -882,6 +887,9 @@ pg_wait_sampling_get_history(PG_FUNCTION_ARGS)
 						   TEXTOID, -1, 0);
 		TupleDescInitEntry(tupdesc, (AttrNumber) 5, "queryid",
 						   INT8OID, -1, 0);
+#if PG_VERSION_NUM >= 190000
+		TupleDescFinalize(tupdesc);
+#endif
 		funcctx->tuple_desc = BlessTupleDesc(tupdesc);
 
 		MemoryContextSwitchTo(oldcontext);