Update of /cvsroot/monetdb/geom/src/lib
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5667/src/lib

Modified Files:
      Tag: Geom_0-4
        libgeom.mx 
Log Message:

next attempt to fix compilation with gcc 4.3.0 on Gentoo:
declare variables with all type qualifiers, i.e.,
"const GEOS... GOES_DLL"
instead of only
"const GEOS..."


U libgeom.mx
Index: libgeom.mx
===================================================================
RCS file: /cvsroot/monetdb/geom/src/lib/libgeom.mx,v
retrieving revision 1.5.4.2
retrieving revision 1.5.4.3
diff -u -d -r1.5.4.2 -r1.5.4.3
--- libgeom.mx  4 Jun 2008 09:51:13 -0000       1.5.4.2
+++ libgeom.mx  5 Jun 2008 05:49:13 -0000       1.5.4.3
@@ -178,7 +178,7 @@
                return 0;
 
        if (GEOSGeomTypeId(envelope) == GEOS_POINT) {
-               const GEOSCoordSeq coords = GEOSGeom_getCoordSeq(envelope);
+               const GEOSCoordSeq GEOS_DLL coords = 
GEOSGeom_getCoordSeq(envelope);
                GEOSCoordSeq_getX(coords, 0, &xmin);
                GEOSCoordSeq_getY(coords, 0, &ymin);
                res->xmin = xmin;
@@ -186,9 +186,9 @@
                res->xmax = xmin;
                res->ymax = ymin;
        } else { /* GEOSGeomTypeId(envelope) == GEOS_POLYGON */
-               const GEOSGeom ring = GEOSGetExteriorRing(envelope);
+               const GEOSGeom GEOS_DLL ring = GEOSGetExteriorRing(envelope);
                if (ring) {
-                       const GEOSCoordSeq coords = GEOSGeom_getCoordSeq(ring); 
+                       const GEOSCoordSeq GEOS_DLL coords = 
GEOSGeom_getCoordSeq(ring); 
                        GEOSCoordSeq_getX(coords, 0, &xmin);
                        GEOSCoordSeq_getY(coords, 0, &ymin);
                        GEOSCoordSeq_getX(coords, 2, &xmax);


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to