From: Sandro Santilli <strk@keybit.net>
Date: Thu, 9 Feb 2012 17:00:02 +0000 (+0000)
Subject: Fix header guard of pgsql_compat.h and drop the duplicate
X-Git-Tag: 2.0.0alpha5~64
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6498c6f9ed3c80c23c7a46c9a7171d7876f389c7;p=postgis

Fix header guard of pgsql_compat.h and drop the duplicate

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

diff --git a/libpgcommon/pgsql_compat.h b/libpgcommon/pgsql_compat.h
index c5be1d125..8104db960 100644
--- a/libpgcommon/pgsql_compat.h
+++ b/libpgcommon/pgsql_compat.h
@@ -1,4 +1,5 @@
 #ifndef _PGSQL_COMPAT_H
+#define _PGSQL_COMPAT_H 1
 
 /* Make sure PG_NARGS is defined for older PostgreSQL versions */
 #ifndef PG_NARGS
diff --git a/raster/rt_pg/pgsql_compat.h b/raster/rt_pg/pgsql_compat.h
deleted file mode 100644
index 049cd0b4e..000000000
--- a/raster/rt_pg/pgsql_compat.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef PGSQL_COMPAT_H_INCLUDED
-
-/* Make sure PG_NARGS is defined for older PostgreSQL versions */
-#ifndef PG_NARGS
-#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_INCLUDED */