From: Mark Cave-Ayland Date: Thu, 16 Jul 2009 21:32:48 +0000 (+0000) Subject: Move SERIALIZED_FORM to lwgeom_pg.h from liblwgeom.h since it references a PostgreSQL... X-Git-Tag: 1.5.0b1~574 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91a55bceb17971dddcd955415c418e60843ee5ea;p=postgis Move SERIALIZED_FORM to lwgeom_pg.h from liblwgeom.h since it references a PostgreSQL-only structure. Per report from Nicklas Aven. git-svn-id: http://svn.osgeo.org/postgis/trunk@4310 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/liblwgeom/liblwgeom.h b/liblwgeom/liblwgeom.h index 132cc8254..7c018d5b2 100644 --- a/liblwgeom/liblwgeom.h +++ b/liblwgeom/liblwgeom.h @@ -718,12 +718,6 @@ char is_worth_caching_pglwgeom_bbox(const PG_LWGEOM *); char is_worth_caching_serialized_bbox(const uchar *); char is_worth_caching_lwgeom_bbox(const LWGEOM *); -/* - * Use this macro to extract the char * required - * by most functions from an PG_LWGEOM struct. - * (which is an PG_LWGEOM w/out int32 size casted to char *) - */ -#define SERIALIZED_FORM(x) ((uchar *)VARDATA((x))) /* * This function computes the size in bytes diff --git a/postgis/lwgeom_pg.h b/postgis/lwgeom_pg.h index bbb936749..2354b2900 100644 --- a/postgis/lwgeom_pg.h +++ b/postgis/lwgeom_pg.h @@ -83,6 +83,14 @@ extern int pglwgeom_getSRID(PG_LWGEOM *pglwgeom); extern Oid getGeometryOID(void); /* PG-dependant */ + +/* + * Use this macro to extract the char * required + * by most functions from an PG_LWGEOM struct. + * (which is an PG_LWGEOM w/out int32 size casted to char *) + */ +#define SERIALIZED_FORM(x) ((uchar *)VARDATA((x))) + /* BOX is postgresql standard type */ extern void box_to_box3d_p(BOX *box, BOX3D *out); extern void box3d_to_box_p(BOX3D *box, BOX *out);