Merge trackpg/REL1_6_STABLE/pg16 into REL1_6_STABLE

Addresses PR #451.
tada · Sep 16, 2023 · a0debcd · a0debcd
2 parents 188b418 + e004f0a
commit a0debcd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/pljava-so/src/main/c/Backend.c b/pljava-so/src/main/c/Backend.c
@@ -29,7 +29,7 @@
 #include <catalog/pg_type.h>
 
 #if PG_VERSION_NUM >= 120000
- #ifdef HAVE_DLOPEN
+ #if defined(HAVE_DLOPEN)  ||  PG_VERSION_NUM >= 160000 && ! defined(WIN32)
  #include <dlfcn.h>
  #endif
  #define pg_dlopen(f) dlopen((f), RTLD_NOW | RTLD_GLOBAL)

diff --git a/pljava-so/src/main/c/Function.c b/pljava-so/src/main/c/Function.c
@@ -34,6 +34,10 @@
 #include <funcapi.h>
 #include <utils/typcache.h>
 
+#if PG_VERSION_NUM >= 160000
+#define PG_FUNCNAME_MACRO __func__
+#endif
+
 #ifdef _MSC_VER
 #	define strcasecmp _stricmp
 #	define strncasecmp _strnicmp

diff --git a/pljava-so/src/main/c/type/AclId.c b/pljava-so/src/main/c/type/AclId.c
@@ -22,6 +22,12 @@
 #include "org_postgresql_pljava_internal_AclId.h"
 #include "pljava/Exception.h"
 
+#if PG_VERSION_NUM >= 160000
+#include <catalog/pg_namespace.h>
+#define pg_namespace_aclcheck(oid,rid,mode) \
+	object_aclcheck(NamespaceRelationId, (oid), (rid), (mode))
+#endif
+
 static jclass    s_AclId_class;
 static jmethodID s_AclId_init;
 static jfieldID  s_AclId_m_native;