[postgis-tickets] r16578 - Fix PG 9.5 build in 2.4

[Raul]

Author: algunenano
Date: 2018-05-21 03:41:32 -0700 (Mon, 21 May 2018)
New Revision: 16578

Modified:
   branches/2.4/NEWS
   branches/2.4/extensions/address_standardizer/std_pg_hash.c
   branches/2.4/libpgcommon/lwgeom_transform.c
Log:
Fix PG 9.5 build in 2.4

References #4090
Applies the same fix as #3950
Closes https://github.com/postgis/postgis/pull/243


Modified: branches/2.4/NEWS
===================================================================
--- branches/2.4/NEWS	2018-05-20 14:46:48 UTC (rev 16577)
+++ branches/2.4/NEWS	2018-05-21 10:41:32 UTC (rev 16578)
@@ -10,6 +10,7 @@
   - #4070, use standard interruption error code on GEOS interruptions
            (Paul Ramsey)
   - #3980, delay freeing input until processing complete (lucasvr)
+  - #4090, PG 11 support (Paul Ramsey, Raúl Marín)
 
 
 PostGIS 2.4.4

Modified: branches/2.4/extensions/address_standardizer/std_pg_hash.c
===================================================================
--- branches/2.4/extensions/address_standardizer/std_pg_hash.c	2018-05-20 14:46:48 UTC (rev 16577)
+++ branches/2.4/extensions/address_standardizer/std_pg_hash.c	2018-05-21 10:41:32 UTC (rev 16578)
@@ -113,7 +113,7 @@
 
 
 static void
-#if POSTGIS_PGSQL_VERSION < 95
+#if POSTGIS_PGSQL_VERSION < 96
 
 StdCacheDelete(MemoryContext context)
 {
@@ -140,7 +140,7 @@
     DeleteStdHashEntry(context);
 }
 
-#if POSTGIS_PGSQL_VERSION < 95
+#if POSTGIS_PGSQL_VERSION < 96
 
 static void
 StdCacheInit(MemoryContext context)
@@ -194,7 +194,7 @@
 #endif
 };
 
-#endif /* POSTGIS_PGSQL_VERSION < 95 */
+#endif /* POSTGIS_PGSQL_VERSION < 96 */
 
 
 uint32
@@ -383,7 +383,7 @@
     DBG("Adding item to STD cache ('%s', '%s', '%s') index %d", lextab, gaztab, rultab, STDCache->NextSlot);
 
 
-#if POSTGIS_PGSQL_VERSION < 95
+#if POSTGIS_PGSQL_VERSION < 96
     STDMemoryContext = MemoryContextCreate(T_AllocSetContext, 8192,
                                            &StdCacheContextMethods,
                                            STDCache->StdCacheContext,

Modified: branches/2.4/libpgcommon/lwgeom_transform.c
===================================================================
--- branches/2.4/libpgcommon/lwgeom_transform.c	2018-05-20 14:46:48 UTC (rev 16577)
+++ branches/2.4/libpgcommon/lwgeom_transform.c	2018-05-21 10:41:32 UTC (rev 16578)
@@ -559,7 +559,7 @@
 	 */
 	POSTGIS_DEBUGF(3, "adding SRID %d with proj4text \"%s\" to query cache at index %d", srid, proj_str, PROJ4Cache->PROJ4SRSCacheCount);
 
-#if POSTGIS_PGSQL_VERSION < 95
+#if POSTGIS_PGSQL_VERSION < 96
 	PJMemoryContext = MemoryContextCreate(T_AllocSetContext, 8192,
 	                                      &PROJ4SRSCacheContextMethods,
 	                                      PROJ4Cache->PROJ4SRSCacheContext,