From 20951bcc751216715e16d914c21ec5547b238423 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Fri, 17 Nov 2006 17:12:11 +0000 Subject: [PATCH] Patch by "Antoine Bajolet" : * 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 --- ChangeLog | 5 +++++ lwgeom/lwgeom_gist.c | 13 ++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cfb3db0df..77add4de0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-11-17 "Antoine Bajolet" + + * lwgeom/lwgeom_gist.c: fixed 'directives may not be used inside a + macro argument' error raised by some compilers. + 2006-11-10 Sandro Santilli * configure.in (geos detection): use $geos_prefix/lib when diff --git a/lwgeom/lwgeom_gist.c b/lwgeom/lwgeom_gist.c index d66a6bab3..9d09f359a 100644 --- 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 + } } -- 2.49.0