[SCM] PostGIS branch stable-3.5 updated. 3.5.0-30-g1acf905de

git at osgeo.org git at osgeo.org
Fri Dec 20 13:14:08 PST 2024


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, stable-3.5 has been updated
       via  1acf905de2dcda489d2846ed7a290cc8d0eb6eb9 (commit)
      from  e4dd391ce992df570fbf8c8adc1e8030282a904c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1acf905de2dcda489d2846ed7a290cc8d0eb6eb9
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Fri Dec 20 13:13:28 2024 -0800

    Remove old override of TupleDescAttr as no longer required
    for pgsql >= 10. Closes #5823

diff --git a/libpgcommon/Makefile.in b/libpgcommon/Makefile.in
index b99b02c89..6f436e764 100644
--- a/libpgcommon/Makefile.in
+++ b/libpgcommon/Makefile.in
@@ -34,8 +34,7 @@ SA_HEADERS = \
 	lwgeom_pg.h \
 	lwgeom_transform.h \
 	lwgeom_cache.h \
-	gserialized_gist.h \
-	pgsql_compat.h
+	gserialized_gist.h
 
 all: libpgcommon.a
 
diff --git a/libpgcommon/common.h b/libpgcommon/common.h
index a84b70c63..681ec8c1c 100644
--- a/libpgcommon/common.h
+++ b/libpgcommon/common.h
@@ -12,7 +12,6 @@
 #ifndef PG_LIBCOMMON_H
 #define PG_LIBCOMMON_H
 
-#include "pgsql_compat.h"
 #include "lwgeom_pg.h"
 #include "lwgeom_transform.h"
 
diff --git a/libpgcommon/lwgeom_pg.h b/libpgcommon/lwgeom_pg.h
index e57081b82..b05290bd2 100644
--- a/libpgcommon/lwgeom_pg.h
+++ b/libpgcommon/lwgeom_pg.h
@@ -25,7 +25,6 @@
 #include "utils/syscache.h"
 
 #include "liblwgeom.h"
-#include "pgsql_compat.h"
 
 #if POSTGIS_PGSQL_VERSION > 150
 #include "varatt.h"
diff --git a/libpgcommon/pgsql_compat.h b/libpgcommon/pgsql_compat.h
deleted file mode 100644
index 0760e3c63..000000000
--- a/libpgcommon/pgsql_compat.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _PGSQL_COMPAT_H
-#define _PGSQL_COMPAT_H 1
-
-#include "access/tupdesc.h"
-
-/* TupleDescAttr was backported into 9.6.5 but we support any 9.6.X */
-#ifndef TupleDescAttr
-#define TupleDescAttr(tupdesc, i) ((tupdesc)->attrs[(i)])
-#endif
-
-#endif /* _PGSQL_COMPAT_H */
diff --git a/postgis/flatgeobuf.c b/postgis/flatgeobuf.c
index e98d6a65b..9fa5be2b3 100644
--- a/postgis/flatgeobuf.c
+++ b/postgis/flatgeobuf.c
@@ -24,7 +24,6 @@
 
 #include <math.h>
 #include "flatgeobuf.h"
-#include "pgsql_compat.h"
 #include "funcapi.h"
 #include "parser/parse_type.h"
 #include "pgtime.h"
diff --git a/postgis/geobuf.c b/postgis/geobuf.c
index da2bd3ff0..f78709439 100644
--- a/postgis/geobuf.c
+++ b/postgis/geobuf.c
@@ -24,7 +24,6 @@
 
 #include <math.h>
 #include "geobuf.h"
-#include "pgsql_compat.h"
 
 #if defined HAVE_LIBPROTOBUF
 
diff --git a/postgis/mvt.c b/postgis/mvt.c
index 85ee75305..8f6b237f8 100644
--- a/postgis/mvt.c
+++ b/postgis/mvt.c
@@ -29,7 +29,6 @@
 
 #include "mvt.h"
 #include "lwgeom_geos.h"
-#include "pgsql_compat.h"
 
 #ifdef HAVE_LIBPROTOBUF
 #include "utils/jsonb.h"
diff --git a/topology/postgis_topology.c b/topology/postgis_topology.c
index d8b4782a8..236b01780 100644
--- a/topology/postgis_topology.c
+++ b/topology/postgis_topology.c
@@ -32,7 +32,6 @@
 /*#define POSTGIS_DEBUG_LEVEL 1*/
 #include "lwgeom_log.h"
 #include "lwgeom_pg.h"
-#include "pgsql_compat.h"
 
 #include <stdarg.h>
 

-----------------------------------------------------------------------

Summary of changes:
 libpgcommon/Makefile.in     |  3 +--
 libpgcommon/common.h        |  1 -
 libpgcommon/lwgeom_pg.h     |  1 -
 libpgcommon/pgsql_compat.h  | 11 -----------
 postgis/flatgeobuf.c        |  1 -
 postgis/geobuf.c            |  1 -
 postgis/mvt.c               |  1 -
 topology/postgis_topology.c |  1 -
 8 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 libpgcommon/pgsql_compat.h


hooks/post-receive
-- 
PostGIS


More information about the postgis-tickets mailing list