From 63eacc558905aff683c0d9fa1d50b9a571f741e7 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 5 Mar 2024 16:31:02 +0100
Subject: [PATCH] fix compilation of PG module for PostgreSQL 16

This version requires an additional include for the macros used.
---
 module/CMakeLists.txt | 2 +-
 module/nominatim.c    | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/module/CMakeLists.txt b/module/CMakeLists.txt
index c8594298..01831f90 100644
--- a/module/CMakeLists.txt
+++ b/module/CMakeLists.txt
@@ -1,6 +1,6 @@
 # just use the pgxs makefile
 
-foreach(suffix ${PostgreSQL_ADDITIONAL_VERSIONS} "15" "14" "13" "12" "11" "10" "9.6")
+foreach(suffix ${PostgreSQL_ADDITIONAL_VERSIONS} "16" "15" "14" "13" "12" "11" "10" "9.6")
     list(APPEND PG_CONFIG_HINTS
          "/usr/pgsql-${suffix}/bin")
 endforeach()
diff --git a/module/nominatim.c b/module/nominatim.c
index 9d43c22f..54632f76 100644
--- a/module/nominatim.c
+++ b/module/nominatim.c
@@ -11,10 +11,12 @@
 #include "mb/pg_wchar.h"
 #include <utfasciitable.h>
 
-#ifdef PG_MODULE_MAGIC
-PG_MODULE_MAGIC;
+#if PG_MAJORVERSION_NUM > 15
+#include "varatt.h"
 #endif
 
+PG_MODULE_MAGIC;
+
 Datum transliteration( PG_FUNCTION_ARGS );
 Datum gettokenstring( PG_FUNCTION_ARGS );
 void str_replace(char* buffer, int* len, int* changes, char* from, int fromlen, char* to, int tolen, int);
-- 
2.45.1