#2883 warning SET_VARSIZE(PTR,len) redefined. get rid of assert (its included via...

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

diff --git a/liblwgeom/lwgeom_sfcgal.c b/liblwgeom/lwgeom_sfcgal.c
index b9c6822ca303d0164fa0ff9434fbb70286e26f2b..2edf434ce8d53392a84ad0636e0c248fa18fee63 100644 (file)
--- a/liblwgeom/lwgeom_sfcgal.c
+++ b/liblwgeom/lwgeom_sfcgal.c
@@ -12,8 +12,6 @@
  *
  **********************************************************************/
 
-
-#include <assert.h>
 #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 8104db960b93398c0c53132f959bfe5eb6e948f4..30053ff42c047e6e695fb498125ae1236db5b7a8 100644 (file)
--- 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 */