Patch by "Antoine Bajolet" <antoine.bajolet@tdf.fr>:

        * lwgeom/lwgeom_gist.c: fixed 'directives may not be used inside a
          macro argument' error raised by some compilers.

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

diff --git a/ChangeLog b/ChangeLog
index cfb3db0df986a97bdf715e4640cfdc23cb9b7ff5..77add4de06b1c41aeabe9ce0901b7eb6a387bb5b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-17 "Antoine Bajolet" <antoine.bajolet@tdf.fr>
+
+       * lwgeom/lwgeom_gist.c: fixed 'directives may not be used inside a
+         macro argument' error raised by some compilers.
+
 2006-11-10 Sandro Santilli <strk@refractions.net>
 
        * configure.in (geos detection): use $geos_prefix/lib when

diff --git a/lwgeom/lwgeom_gist.c b/lwgeom/lwgeom_gist.c
index d66a6bab36b704f0fb2c1630ebf222024e962739..9d09f359abfdba52a5737c3fc9be630de518e6ec 100644 (file)
--- a/lwgeom/lwgeom_gist.c
+++ b/lwgeom/lwgeom_gist.c
@@ -542,14 +542,18 @@ Datum LWGEOM_gist_compress(PG_FUNCTION_ARGS)
                        if (in != (PG_LWGEOM*)DatumGetPointer(entry->key))
                                pfree(in);  /* PG_FREE_IF_COPY */
 
+#if USE_VERSION >= 82
                        gistentryinit(*retval, PointerGetDatum(rr),
                                entry->rel, entry->page,
-#if USE_VERSION >= 82
                                entry->offset,
+                               FALSE);
 #else
+                       gistentryinit(*retval, PointerGetDatum(rr),
+                               entry->rel, entry->page,
                                entry->offset, sizeof(BOX2DFLOAT4),
-#endif
                                FALSE);
+#endif
+
 
                }
                else
@@ -557,12 +561,15 @@ Datum LWGEOM_gist_compress(PG_FUNCTION_ARGS)
 #ifdef PGIS_DEBUG_GIST4
                elog(NOTICE,"GIST: LWGEOM_gist_compress got a NULL key");
 #endif
-                       gistentryinit(*retval, (Datum) 0, entry->rel,
+
 #if USE_VERSION >= 82
+                       gistentryinit(*retval, (Datum) 0, entry->rel,
                                entry->page, entry->offset, FALSE);
 #else
+                       gistentryinit(*retval, (Datum) 0, entry->rel,
                                entry->page, entry->offset, 0, FALSE);
 #endif
+
                }
 
        }