Move getMachineEndian() and error_if_srid_mismatch() from liblwgeom.h to liblwgeom_in...

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

diff --git a/liblwgeom/liblwgeom.h b/liblwgeom/liblwgeom.h
index e61d3109b85aa5843291e51cebd13a1ebdb5b66e..afc5a4ce0cac745ac98bc58659c03dac3309c2d4 100644 (file)
--- a/liblwgeom/liblwgeom.h
+++ b/liblwgeom/liblwgeom.h
@@ -2189,13 +2189,6 @@ extern void lwfree(void *mem);
 extern void trim_trailing_zeros(char *num);
 extern char *lwmessage_truncate(char *str, int startpos, int endpos, int maxlength, int truncdirection);
 
-/* Machine endianness */
-#define XDR 0
-#define NDR 1
-extern char getMachineEndian(void);
-
-void error_if_srid_mismatch(int srid1, int srid2);
-
 
 /*******************************************************************************
  * SQLMM internal functions - TODO: Move into separate header files

diff --git a/liblwgeom/liblwgeom_internal.h b/liblwgeom/liblwgeom_internal.h
index 088bb9509ccd53fa4e7f39ba65588d9815bed111..7f31a1cf956a0241e70e92769544cf55ddbb9391 100644 (file)
--- a/liblwgeom/liblwgeom_internal.h
+++ b/liblwgeom/liblwgeom_internal.h
@@ -79,6 +79,16 @@
 * Internal prototypes
 */
 
+
+/* Machine endianness */
+#define XDR 0
+#define NDR 1
+extern char getMachineEndian(void);
+
+/* Raise an lwerror if srids do not match */
+void error_if_srid_mismatch(int srid1, int srid2);
+
+
 /*
 * Force dims
 */
@@ -211,4 +221,4 @@ void ptarray_affine(POINTARRAY *pa, const AFFINE *affine);
 char ptarray_isccw(const POINTARRAY *pa);
 
 
-#endif /* LIBLWGEOM_INTERNAL */
\ No newline at end of file
+#endif /* LIBLWGEOM_INTERNAL */

diff --git a/liblwgeom/lwgeom_geos.c b/liblwgeom/lwgeom_geos.c
index 3c7afa7e88ea9d849f11c6066ff2d71e88fcf534..d9aae6d895d487de6e8aed31f22ac82124a3bfdc 100644 (file)
--- a/liblwgeom/lwgeom_geos.c
+++ b/liblwgeom/lwgeom_geos.c
@@ -12,6 +12,7 @@
 
 #include "lwgeom_geos.h"
 #include "liblwgeom.h"
+#include "liblwgeom_internal.h"
 #include "profile.h"
 
 #include <stdlib.h>

diff --git a/postgis/lwgeom_box2dfloat4.c b/postgis/lwgeom_box2dfloat4.c
index fc05c69b40eaeb49821f8a98aaca2aa336c7ad81..9bf53e5a3ee181b9d3658111f0949ae433237a19 100644 (file)
--- a/postgis/lwgeom_box2dfloat4.c
+++ b/postgis/lwgeom_box2dfloat4.c
@@ -7,6 +7,7 @@
 
 #include "lwgeom_pg.h"
 #include "liblwgeom.h"
+#include "liblwgeom_internal.h"
 
 #include <math.h>
 #include <float.h>

diff --git a/postgis/lwgeom_box3d.c b/postgis/lwgeom_box3d.c
index 4dd77316a437c873d9c0945758577fc619c2671e..893b55b3b500e1920709bf386cefcfb000d959dc 100644 (file)
--- a/postgis/lwgeom_box3d.c
+++ b/postgis/lwgeom_box3d.c
@@ -11,6 +11,7 @@
 
 #include "lwgeom_pg.h"
 #include "liblwgeom.h"
+#include "liblwgeom_internal.h"
 
 #include <math.h>
 #include <float.h>

diff --git a/postgis/lwgeom_functions_analytic.c b/postgis/lwgeom_functions_analytic.c
index 5c521a30cf63c68b5c375c3c99700625623b756f..700c589b08e61d1c8067b72fc5b57bce17bbf6c3 100644 (file)
--- a/postgis/lwgeom_functions_analytic.c
+++ b/postgis/lwgeom_functions_analytic.c
@@ -13,6 +13,7 @@
 #include "postgres.h"
 #include "fmgr.h"
 #include "liblwgeom.h"
+#include "liblwgeom_internal.h"
 #include "lwgeom_pg.h"
 #include "math.h"
 #include "lwgeom_rtree.h"

diff --git a/postgis/lwgeom_geos.c b/postgis/lwgeom_geos.c
index e955445930e74c8fc6a9b245496cfd19f8c2e8e9..94640686998acbc643a0b7a2f0830cb15615d66c 100644 (file)
--- a/postgis/lwgeom_geos.c
+++ b/postgis/lwgeom_geos.c
@@ -17,6 +17,7 @@
 #include "lwgeom_geos_prepared.h"
 #include "funcapi.h"
 #include "lwgeom_functions_analytic.h"
+#include "liblwgeom_internal.h"
 
 #include <string.h>
 #include <assert.h>

diff --git a/postgis/lwgeom_geos_clean.c b/postgis/lwgeom_geos_clean.c
index 1f83ca0dc68bf21f5c4b612798921a9a72a0fe26..22619e19c7d8ef547c80f060f71708ad7707708d 100644 (file)
--- a/postgis/lwgeom_geos_clean.c
+++ b/postgis/lwgeom_geos_clean.c
@@ -36,6 +36,7 @@
  **********************************************************************/
 
 #include "lwgeom_geos.h"
+#include "liblwgeom_internal.h"
 #include "funcapi.h"
 
 #include <string.h>

diff --git a/postgis/lwgeom_geos_sharedpaths.c b/postgis/lwgeom_geos_sharedpaths.c
index 60a9f6bec1d62031de71beb9d52a092cd9454774..9214c3dc07c5be102b0771e63f274aad4988da2f 100644 (file)
--- a/postgis/lwgeom_geos_sharedpaths.c
+++ b/postgis/lwgeom_geos_sharedpaths.c
@@ -26,6 +26,7 @@
  **********************************************************************/
 
 #include "lwgeom_geos.h"
+#include "liblwgeom_internal.h"
 
 #include <string.h>
 #include <assert.h>

diff --git a/postgis/lwgeom_geos_snap.c b/postgis/lwgeom_geos_snap.c
index a01b15a51020f8cfd4ecb6fd870d281659301856..07a728e8a3138e154eef31fb3129257bd426c802 100644 (file)
--- a/postgis/lwgeom_geos_snap.c
+++ b/postgis/lwgeom_geos_snap.c
@@ -18,6 +18,7 @@
  **********************************************************************/
 
 #include "lwgeom_geos.h"
+#include "liblwgeom_internal.h"
 
 #include <string.h>
 #include <assert.h>

diff --git a/postgis/lwgeom_geos_split.c b/postgis/lwgeom_geos_split.c
index 67a62feefd5d911463b61defe1bf2def3c85b608..8720de54aa53f4239311f7e0db280dcdb68d8922 100644 (file)
--- a/postgis/lwgeom_geos_split.c
+++ b/postgis/lwgeom_geos_split.c
@@ -37,6 +37,7 @@
  **********************************************************************/
 
 #include "lwgeom_geos.h"
+#include "liblwgeom_internal.h"
 #include "funcapi.h"
 
 #include <string.h>

diff --git a/postgis/lwgeom_gist.c b/postgis/lwgeom_gist.c
index 5e37f75acf7c13ef78559dd613bfa31f2921fc58..42d653fc9491d56246f3417a9297eb5f3a1ec2f1 100644 (file)
--- a/postgis/lwgeom_gist.c
+++ b/postgis/lwgeom_gist.c
@@ -8,6 +8,7 @@
 
 #include "../postgis_config.h"
 #include "liblwgeom.h"
+#include "liblwgeom_internal.h"
 
 #include "lwgeom_pg.h"