Move SERIALIZED_FORM to lwgeom_pg.h from liblwgeom.h since it references a PostgreSQL...

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 132cc8254c271095ed571900c4214cce997b587e..7c018d5b21ed593043ded317dcdb0f6dd9e04777 100644 (file)
--- 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 bbb936749ff1385e8882e749d5f548be9dcabcbd..2354b290056eba826dbc20fb510de619d1c026ae 100644 (file)
--- 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);