From 324d89ae14092603f41bbc30f0962057ccbdfd72 Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Fri, 8 Aug 2014 01:13:56 +0000 Subject: [PATCH] #2883 warning SET_VARSIZE(PTR,len) redefined. get rid of assert (its included via liblwgeom_internal (way down there), not the ultimate issue though for this., pgsql_compat.h get rid of legacy postgresql 8.2 crap. We haven't supported 8.2 in like 7 years (sfcgal was somehow falling into this loop don't know why since postgis_config.h git-svn-id: http://svn.osgeo.org/postgis/trunk@12873 b70326c6-7e19-0410-871a-916f4a2858ee --- liblwgeom/lwgeom_sfcgal.c | 2 -- libpgcommon/pgsql_compat.h | 10 ---------- 2 files changed, 12 deletions(-) diff --git a/liblwgeom/lwgeom_sfcgal.c b/liblwgeom/lwgeom_sfcgal.c index b9c6822ca..2edf434ce 100644 --- a/liblwgeom/lwgeom_sfcgal.c +++ b/liblwgeom/lwgeom_sfcgal.c @@ -12,8 +12,6 @@ * **********************************************************************/ - -#include #include "lwgeom_sfcgal.h" static int SFCGAL_type_to_lwgeom_type(sfcgal_geometry_type_t type); diff --git a/libpgcommon/pgsql_compat.h b/libpgcommon/pgsql_compat.h index 8104db960..30053ff42 100644 --- a/libpgcommon/pgsql_compat.h +++ b/libpgcommon/pgsql_compat.h @@ -6,14 +6,4 @@ #define PG_NARGS() (fcinfo->nargs) #endif -/* Define ARR_OVERHEAD_NONULLS for PostgreSQL < 8.2 */ -#if POSTGIS_PGSQL_VERSION < 82 -#define ARR_OVERHEAD_NONULLS(x) ARR_OVERHEAD((x)) -#endif - -/* PostgreSQL < 8.3 uses VARATT_SIZEP rather than SET_VARSIZE for varlena types */ -#if POSTGIS_PGSQL_VERSION < 83 -#define SET_VARSIZE(var, size) VARATT_SIZEP(var) = size -#endif - #endif /* _PGSQL_COMPAT_H */ -- 2.40.0