[Liblas-commits] hg: ensure cpl_serv.h does not get pulled in, messing up build (...

[liblas-commits at liblas.org]

changeset 1f0f14aaa9d1 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=1f0f14aaa9d1
summary: ensure cpl_serv.h does not get pulled in, messing up build (#194)

diffstat:

 include/liblas/lasspatialreference.hpp |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (20 lines):

diff -r 1453239751b8 -r 1f0f14aaa9d1 include/liblas/lasspatialreference.hpp
--- a/include/liblas/lasspatialreference.hpp	Thu Nov 11 15:14:03 2010 -0600
+++ b/include/liblas/lasspatialreference.hpp	Mon Nov 15 11:40:24 2010 -0500
@@ -52,11 +52,13 @@
 
 // GDAL OSR
 #ifdef HAVE_GDAL
+
+// Supress inclusion of cpl_serv.h per #194, perhaps remove one day
+// when libgeotiff 1.4.0+ is widely used
+#define CPL_SERV_H_INCLUDED
+
 #include <ogr_srs_api.h>
 #include <cpl_port.h>
-//#include <cpl_serv.h>
-//#include <geo_tiffp.h>
-//#define CPL_ERROR_H_INCLUDED
 #include <geo_normalize.h>
 #include <geovalues.h>
 #include <ogr_spatialref.h>