update spatialite to 2.3.1

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11031 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jul 6, 2009 · a389dae · a389dae
1 parent 97d6c19
commit a389dae
Show file tree

Hide file tree

Showing 6 changed files with 17,310 additions and 8,527 deletions.
diff --git a/src/core/spatialite/headers/spatialite/gaiaexif.h b/src/core/spatialite/headers/spatialite/gaiaexif.h
@@ -66,6 +66,8 @@ extern "C"
 #define GAIA_ZIP_BLOB		6
 #define GAIA_PDF_BLOB		7
 #define GAIA_GEOMETRY_BLOB	8
+#define GAIA_TIFF_BLOB		9
+#define GAIA_WAVELET_BLOB	10
 
 /* constants used for EXIF value types */
 #define GAIA_EXIF_NONE		0

diff --git a/src/core/spatialite/headers/spatialite/gaiageo.h b/src/core/spatialite/headers/spatialite/gaiageo.h
@@ -553,7 +553,7 @@ extern "C"
 					unsigned int size, double *maxy);
     GAIAGEO_DECLARE gaiaGeomCollPtr gaiaBuildRings (gaiaGeomCollPtr geom);
 
-#if OMIT_PROJ == 0		/* including PROJ.4 */
+#ifndef OMIT_PROJ		/* including PROJ.4 */
 
     GAIAGEO_DECLARE double gaiaRadsToDegs (double rads);
     GAIAGEO_DECLARE double gaiaDegsToRads (double degs);
@@ -563,7 +563,7 @@ extern "C"
 
 #endif				/* end including PROJ.4 */
 
-#if OMIT_GEOS == 0		/* including GEOS */
+#ifndef OMIT_GEOS		/* including GEOS */
 
     GAIAGEO_DECLARE int gaiaGeomCollEquals (gaiaGeomCollPtr geom1,
 					    gaiaGeomCollPtr geom2);