[SCM] PostGIS branch master updated. 3.6.0beta1-10-ge0e19372b

[git at osgeo.org]

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, master has been updated
       via  e0e19372b7aa15f0d0e1c68de1e33206d7548621 (commit)
      from  18cfba216da44cabc6a4d661887b4ec90bd6c92b (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 e0e19372b7aa15f0d0e1c68de1e33206d7548621
Author: Paul Ramsey <paul.ramsey at snowflake.com>
Date:   Fri Jul 25 09:35:13 2025 -0700

    Remove anticipatory ifdefs around internal pgSQL json support functions, which may or may not ever become public symbols we can rely upon. Closes #5934

diff --git a/postgis/lwgeom_out_geojson.c b/postgis/lwgeom_out_geojson.c
index 411f7c068..86f6b48c9 100644
--- a/postgis/lwgeom_out_geojson.c
+++ b/postgis/lwgeom_out_geojson.c
@@ -32,7 +32,6 @@
 #include "lwgeom_log.h"
 #include "liblwgeom.h"
 
-#if POSTGIS_PGSQL_VERSION < 200
 typedef enum					/* type categories for datum_to_json */
 {
 	JSONTYPE_NULL,				/* null, so we didn't bother to identify */
@@ -47,7 +46,6 @@ typedef enum					/* type categories for datum_to_json */
 	JSONTYPE_CAST,				/* something with an explicit cast to JSON */
 	JSONTYPE_OTHER				/* all else */
 } JsonTypeCategory;
-#endif
 
 static void array_dim_to_json(StringInfo result, int dim, int ndims, int *dims,
 				  Datum *vals, bool *nulls, int *valcount,
@@ -69,11 +67,9 @@ static void composite_to_json(Datum composite, StringInfo result,
 static void datum_to_json(Datum val, bool is_null, StringInfo result,
 						  JsonTypeCategory tcategory, Oid outfuncoid,
 						  bool key_scalar);
-#if POSTGIS_PGSQL_VERSION < 200
 static void json_categorize_type(Oid typoid,
 								 JsonTypeCategory *tcategory,
 								 Oid *outfuncoid);
-#endif
 static char * postgis_JsonEncodeDateTime(char *buf, Datum value, Oid typid);
 static int postgis_time2tm(TimeADT time, struct pg_tm *tm, fsec_t *fsec);
 static int postgis_timetz2tm(TimeTzADT *time, struct pg_tm *tm, fsec_t *fsec, int *tzp);
@@ -283,7 +279,6 @@ composite_to_geojson(FunctionCallInfo fcinfo,
  * output function OID.  If the returned category is JSONTYPE_CAST, we
  * return the OID of the type->JSON cast function instead.
  */
-#if POSTGIS_PGSQL_VERSION < 200
 static void
 json_categorize_type(Oid typoid,
 					 JsonTypeCategory *tcategory,
@@ -376,7 +371,7 @@ json_categorize_type(Oid typoid,
 			break;
 	}
 }
-#endif
+
 /*
  * Turn a Datum into JSON text, appending the string to "result".
  *

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

Summary of changes:
 postgis/lwgeom_out_geojson.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)


hooks/post-receive
-- 
PostGIS