From: Paul Ramsey Date: Thu, 12 Nov 2009 04:09:14 +0000 (+0000) Subject: Remove old version ifdefs for versions < PgSQL 8.3 (#290) X-Git-Tag: 1.5.0b1~256 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b883229ade2372c429e0c597c0b5e62758011746;p=postgis Remove old version ifdefs for versions < PgSQL 8.3 (#290) git-svn-id: http://svn.osgeo.org/postgis/trunk@4793 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/postgis/lwgeom_functions_basic.c b/postgis/lwgeom_functions_basic.c index 6a51865e5..eb645eece 100644 --- a/postgis/lwgeom_functions_basic.c +++ b/postgis/lwgeom_functions_basic.c @@ -1880,10 +1880,8 @@ Datum LWGEOM_accum(PG_FUNCTION_ARGS) SET_VARSIZE(result, nbytes); result->ndim = 1; result->elemtype = oid; - -#if POSTGIS_PGSQL_VERSION > 81 result->dataoffset = 0; -#endif + memcpy(ARR_DIMS(result), &nelems, sizeof(int)); memcpy(ARR_LBOUND(result), &lbs, sizeof(int)); memcpy(ARR_DATA_PTR(result), geom, VARSIZE(geom)); diff --git a/postgis/lwgeom_gist.c b/postgis/lwgeom_gist.c index fb39ac160..e1ad4a7c4 100644 --- a/postgis/lwgeom_gist.c +++ b/postgis/lwgeom_gist.c @@ -532,17 +532,10 @@ Datum LWGEOM_gist_compress(PG_FUNCTION_ARGS) if (in != (PG_LWGEOM*)DatumGetPointer(entry->key)) pfree(in); /* PG_FREE_IF_COPY */ -#if POSTGIS_PGSQL_VERSION >= 82 gistentryinit(*retval, PointerGetDatum(rr), entry->rel, entry->page, entry->offset, FALSE); -#else - gistentryinit(*retval, PointerGetDatum(rr), - entry->rel, entry->page, - entry->offset, sizeof(BOX2DFLOAT4), - FALSE); -#endif } @@ -550,13 +543,8 @@ Datum LWGEOM_gist_compress(PG_FUNCTION_ARGS) { POSTGIS_DEBUG(4, "GIST: LWGEOM_gist_compress got a NULL key"); -#if POSTGIS_PGSQL_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 }