From: Bborie Park Date: Fri, 2 Aug 2013 20:56:33 +0000 (+0000) Subject: Fixes to make sure PostgreSQL version > 9.2 compile without warnings X-Git-Tag: 2.2.0rc1~1429 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=68735ef511f4ab66e42b606967b1aeae286e9ef8;p=postgis Fixes to make sure PostgreSQL version > 9.2 compile without warnings git-svn-id: http://svn.osgeo.org/postgis/trunk@11720 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/raster/Makefile.in b/raster/Makefile.in index 5e71c6b2e..c112e2e78 100644 --- a/raster/Makefile.in +++ b/raster/Makefile.in @@ -10,8 +10,6 @@ # ############################################################################# -.NOTPARALLEL: - all: @RT_CORE_LIB@ @RT_PG_LIB@ @RT_LOADER@ @RT_POSTGIS_SQL@ corelib: diff --git a/raster/rt_pg/rtpg_band_properties.c b/raster/rt_pg/rtpg_band_properties.c index 9a282c4f3..a8a376dee 100644 --- a/raster/rt_pg/rtpg_band_properties.c +++ b/raster/rt_pg/rtpg_band_properties.c @@ -36,6 +36,12 @@ #include "utils/array.h" /* for ArrayType */ #include "catalog/pg_type.h" /* for INT2OID, INT4OID, FLOAT4OID, FLOAT8OID and TEXTOID */ +#include "../../postgis_config.h" + +#if POSTGIS_PGSQL_VERSION > 92 +#include "access/htup_details.h" /* for heap_form_tuple() */ +#endif + #include "rtpostgis.h" /* Get all the properties of a raster band */ diff --git a/raster/rt_pg/rtpg_gdal.c b/raster/rt_pg/rtpg_gdal.c index f964d50cb..5906d2e43 100644 --- a/raster/rt_pg/rtpg_gdal.c +++ b/raster/rt_pg/rtpg_gdal.c @@ -36,6 +36,12 @@ #include "utils/array.h" /* for ArrayType */ #include "catalog/pg_type.h" /* for INT2OID, INT4OID, FLOAT4OID, FLOAT8OID and TEXTOID */ +#include "../../postgis_config.h" + +#if POSTGIS_PGSQL_VERSION > 92 +#include "access/htup_details.h" /* for heap_form_tuple() */ +#endif + #include "rtpostgis.h" #include "rtpg_internal.h" diff --git a/raster/rt_pg/rtpg_geometry.c b/raster/rt_pg/rtpg_geometry.c index a7a6d6167..ed492e3b6 100644 --- a/raster/rt_pg/rtpg_geometry.c +++ b/raster/rt_pg/rtpg_geometry.c @@ -37,6 +37,11 @@ #include /* for text_to_cstring() */ #include "../../postgis_config.h" + +#if POSTGIS_PGSQL_VERSION > 92 +#include "access/htup_details.h" /* for heap_form_tuple() */ +#endif + #include "lwgeom_pg.h" #include "rtpostgis.h" diff --git a/raster/rt_pg/rtpg_pixel.c b/raster/rt_pg/rtpg_pixel.c index 7b93ba20c..3c21940c0 100644 --- a/raster/rt_pg/rtpg_pixel.c +++ b/raster/rt_pg/rtpg_pixel.c @@ -35,6 +35,12 @@ #include "utils/array.h" /* for ArrayType */ #include "catalog/pg_type.h" /* for INT2OID, INT4OID, FLOAT4OID, FLOAT8OID and TEXTOID */ +#include "../../postgis_config.h" + +#if POSTGIS_PGSQL_VERSION > 92 +#include "access/htup_details.h" /* for heap_form_tuple() */ +#endif + #include "rtpostgis.h" /* Get pixel value */ diff --git a/raster/rt_pg/rtpg_raster_properties.c b/raster/rt_pg/rtpg_raster_properties.c index 368b04070..d3157c7e7 100644 --- a/raster/rt_pg/rtpg_raster_properties.c +++ b/raster/rt_pg/rtpg_raster_properties.c @@ -32,6 +32,8 @@ #include #include +#include "../../postgis_config.h" + #if POSTGIS_PGSQL_VERSION > 92 #include "access/htup_details.h" /* for heap_form_tuple() */ #endif diff --git a/raster/rt_pg/rtpg_statistics.c b/raster/rt_pg/rtpg_statistics.c index 453c26a4d..58fcf5563 100644 --- a/raster/rt_pg/rtpg_statistics.c +++ b/raster/rt_pg/rtpg_statistics.c @@ -37,6 +37,12 @@ #include #include /* for SRF */ +#include "../../postgis_config.h" + +#if POSTGIS_PGSQL_VERSION > 92 +#include "access/htup_details.h" /* for heap_form_tuple() */ +#endif + #include "rtpostgis.h" /* Get summary stats */