Add compability with pg11

ildus · ildus · commit 2f5d1d2f9d96 · 2018-10-12T15:20:13.000+03:00
diff --git a/sr_plan.c b/sr_plan.c
@@ -3,7 +3,7 @@
 #include "commands/extension.h"
 #include "catalog/pg_extension.h"
 #include "catalog/indexing.h"
-#include "access/sysattr.h" 
+#include "access/sysattr.h"
 #include "access/xact.h"
 #include "utils/lsyscache.h"
 
@@ -406,7 +406,7 @@ PG_FUNCTION_INFO_V1(explain_jsonb_plan);
 Datum
 explain_jsonb_plan(PG_FUNCTION_ARGS)
 {
-	Jsonb *jsonb_plan = PG_GETARG_JSONB(0);
+	Jsonb *jsonb_plan = PG_GETARG_JSONB_P(0);
 	Node *plan;
 
 	if (jsonb_plan == NULL)
@@ -511,7 +511,7 @@ sr_plan_invalid_table(PG_FUNCTION_ARGS)
 	if (fcinfo_new.isnull)
 		elog(ERROR, "function %p returned NULL", (void *) pg_event_trigger_dropped_objects);
 
-	slot = MakeTupleTableSlot();
+	slot = MakeTupleTableSlotCompat();
 	ExecSetSlotDescriptor(slot, rsinfo.setDesc);
 
 	while(tuplestore_gettupleslot(rsinfo.setResult, true,
diff --git a/sr_plan.h b/sr_plan.h
@@ -37,4 +37,23 @@ Jsonb *node_tree_to_jsonb(const void *obj, Oid fake_func, bool skip_location_fro
 void *jsonb_to_node_tree(Jsonb *json, void *(*hookPtr) (void *));
 void common_walker(const void *obj, void (*callback) (void *));
 
+/*
+ * MakeTupleTableSlot()
+ */
+#if PG_VERSION_NUM >= 110000
+#define MakeTupleTableSlotCompat() \
+	MakeTupleTableSlot(NULL)
+#else
+#define MakeTupleTableSlotCompat() \
+	MakeTupleTableSlot()
+#endif
+
+#ifndef PG_GETARG_JSONB_P
+#define PG_GETARG_JSONB_P(x)	PG_GETARG_JSONB(x)
+#endif
+
+#ifndef PG_RETURN_JSONB_P
+#define PG_RETURN_JSONB_P(x)	PG_RETURN_JSONB(x)
+#endif
+
 #endif
