From: Mark Cave-Ayland <mark.cave-ayland@siriusit.co.uk>
Date: Thu, 7 Jan 2010 16:04:22 +0000 (+0000)
Subject: Apply a modified version of Guillaume Lelarge's patch to allow compilation under... 
X-Git-Tag: 1.5.0b1~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c70cec2e1ba0084cb49aaa398298f2e7c293f5c9;p=postgis

Apply a modified version of Guillaume Lelarge's patch to allow compilation under current PostgreSQL 8.5 CVS.


git-svn-id: http://svn.osgeo.org/postgis/trunk@5104 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/postgis/geography_estimate.c b/postgis/geography_estimate.c
index 4350ced10..01c75c0c1 100644
--- a/postgis/geography_estimate.c
+++ b/postgis/geography_estimate.c
@@ -539,7 +539,10 @@ Datum geography_gist_selectivity(PG_FUNCTION_ARGS)
 
 
 	if ( ! get_attstatsslot(stats_tuple, 0, 0, STATISTIC_KIND_GEOGRAPHY, InvalidOid, NULL, NULL,
-							(float4 **)gsptr, &geogstats_nvalues) )
+#if POSTGIS_PGSQL_VERSION >= 85
+					NULL,
+#endif
+					(float4 **)gsptr, &geogstats_nvalues) )
 	{
 		POSTGIS_DEBUG(3, " STATISTIC_KIND_GEOGRAPHY stats not found - returning default geography selectivity");
 
@@ -651,6 +654,9 @@ Datum geography_gist_join_selectivity(PG_FUNCTION_ARGS)
 	}
 
 	if ( ! get_attstatsslot(stats1_tuple, 0, 0, STATISTIC_KIND_GEOGRAPHY, InvalidOid, NULL, NULL,
+#if POSTGIS_PGSQL_VERSION >= 85
+		NULL,
+#endif
 		(float4 **)gs1ptr, &geogstats1_nvalues) )
 	{
 		POSTGIS_DEBUG(3, " STATISTIC_KIND_GEOGRAPHY stats not found - returning default geometry join selectivity");
@@ -672,6 +678,9 @@ Datum geography_gist_join_selectivity(PG_FUNCTION_ARGS)
 	}
 
 	if ( ! get_attstatsslot(stats2_tuple, 0, 0, STATISTIC_KIND_GEOGRAPHY, InvalidOid, NULL, NULL,
+#if POSTGIS_PGSQL_VERSION >= 85
+		NULL,
+#endif
 		(float4 **)gs2ptr, &geogstats2_nvalues) )
 	{
 		POSTGIS_DEBUG(3, " STATISTIC_KIND_GEOGRAPHY stats not found - returning default geometry join selectivity");
diff --git a/postgis/lwgeom_estimate.c b/postgis/lwgeom_estimate.c
index def7d2ee0..7bd60f527 100644
--- a/postgis/lwgeom_estimate.c
+++ b/postgis/lwgeom_estimate.c
@@ -237,9 +237,11 @@ Datum LWGEOM_gist_joinsel(PG_FUNCTION_ARGS)
 
 
 
-	if ( ! get_attstatsslot(stats1_tuple, 0, 0,
-							STATISTIC_KIND_GEOMETRY, InvalidOid, NULL, NULL,
-							(float4 **)gs1ptr, &geomstats1_nvalues) )
+	if ( ! get_attstatsslot(stats1_tuple, 0, 0, STATISTIC_KIND_GEOMETRY, InvalidOid, NULL, NULL,
+#if POSTGIS_PGSQL_VERSION >= 85 
+					NULL,
+#endif
+					(float4 **)gs1ptr, &geomstats1_nvalues) )
 	{
 		POSTGIS_DEBUG(3, " STATISTIC_KIND_GEOMETRY stats not found - returning default geometry join selectivity");
 
@@ -261,9 +263,11 @@ Datum LWGEOM_gist_joinsel(PG_FUNCTION_ARGS)
 	}
 
 
-	if ( ! get_attstatsslot(stats2_tuple, 0, 0,
-							STATISTIC_KIND_GEOMETRY, InvalidOid, NULL, NULL,
-							(float4 **)gs2ptr, &geomstats2_nvalues) )
+	if ( ! get_attstatsslot(stats2_tuple, 0, 0, STATISTIC_KIND_GEOMETRY, InvalidOid, NULL, NULL,
+#if POSTGIS_PGSQL_VERSION >= 85
+					NULL,
+#endif
+					(float4 **)gs2ptr, &geomstats2_nvalues) )
 	{
 		POSTGIS_DEBUG(3, " STATISTIC_KIND_GEOMETRY stats not found - returning default geometry join selectivity");
 
@@ -714,9 +718,11 @@ Datum LWGEOM_gist_sel(PG_FUNCTION_ARGS)
 	}
 
 
-	if ( ! get_attstatsslot(stats_tuple, 0, 0,
-							STATISTIC_KIND_GEOMETRY, InvalidOid, NULL, NULL,
-							(float4 **)gsptr, &geomstats_nvalues) )
+	if ( ! get_attstatsslot(stats_tuple, 0, 0, STATISTIC_KIND_GEOMETRY, InvalidOid, NULL, NULL,
+#if POSTGIS_PGSQL_VERSION >= 85
+					NULL,
+#endif
+					(float4 **)gsptr, &geomstats_nvalues) )
 	{
 		POSTGIS_DEBUG(3, " STATISTIC_KIND_GEOMETRY stats not found - returning default geometry selectivity");
 
diff --git a/postgis/lwgeom_pg.h b/postgis/lwgeom_pg.h
index 2354b2900..083589202 100644
--- a/postgis/lwgeom_pg.h
+++ b/postgis/lwgeom_pg.h
@@ -91,6 +91,14 @@ extern Oid getGeometryOID(void);
  */
 #define SERIALIZED_FORM(x) ((uchar *)VARDATA((x)))
 
+/* 
+ * For PostgreSQL >= 8.5 redefine the STATRELATT macro to its
+ * new value of STATRELATTINH 
+ */
+#if POSTGIS_PGSQL_VERSION >= 85
+	#define STATRELATT STATRELATTINH
+#endif
+
 /* BOX is postgresql standard type */
 extern void box_to_box3d_p(BOX *box, BOX3D *out);
 extern void box3d_to_box_p(BOX3D *box, BOX *out);