[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-1086-g7e62e02ba

[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  7e62e02ba017c560dfd7bff682cdcdc701fef7ef (commit)
      from  bf64bc6886537c999b82bdf7e4be1dd2d390165e (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 7e62e02ba017c560dfd7bff682cdcdc701fef7ef
Author: Regina Obe <lr at pcorp.us>
Date:   Fri Jun 30 07:32:16 2023 -0400

    PG17 is now master and
    still doesn't have the new json api exposed
    Flip the json api to PG18 for now
    May need to flip back later.
    
    References #5421 for PostGIS 3.4.0

diff --git a/postgis/lwgeom_out_geojson.c b/postgis/lwgeom_out_geojson.c
index b545913d4..31b097fd7 100644
--- a/postgis/lwgeom_out_geojson.c
+++ b/postgis/lwgeom_out_geojson.c
@@ -32,7 +32,7 @@
 #include "lwgeom_log.h"
 #include "liblwgeom.h"
 
-#if POSTGIS_PGSQL_VERSION < 170
+#if POSTGIS_PGSQL_VERSION < 180
 typedef enum					/* type categories for datum_to_json */
 {
 	JSONTYPE_NULL,				/* null, so we didn't bother to identify */
@@ -68,7 +68,7 @@ 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 < 170
+#if POSTGIS_PGSQL_VERSION < 180
 static void json_categorize_type(Oid typoid,
 								 JsonTypeCategory *tcategory,
 								 Oid *outfuncoid);
@@ -244,7 +244,7 @@ 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 < 170
+#if POSTGIS_PGSQL_VERSION < 180
 static void
 json_categorize_type(Oid typoid,
 					 JsonTypeCategory *tcategory,

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

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


hooks/post-receive
-- 
PostGIS