MonetDB: geos-reentrant - some how the define from geos doesn't ...

[Niels Nes via checkin-list]

Changeset: 9b40df483808 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9b40df483808
Modified Files:
        geom/lib/libgeom.c
        geom/monetdb5/geom.c
Branch: geos-reentrant
Log Message:

some how the define from geos doesn't quite check every function.
So somemore _r functions used


diffs (26 lines):

diff --git a/geom/lib/libgeom.c b/geom/lib/libgeom.c
--- a/geom/lib/libgeom.c
+++ b/geom/lib/libgeom.c
@@ -69,7 +69,7 @@ wkb2geos(const wkb *geomWKB)
        if (is_wkb_nil(geomWKB))
                return NULL;
 
-       geosGeometry = GEOSGeomFromWKB_buf((unsigned char *) geomWKB->data, 
geomWKB->len);
+       geosGeometry = GEOSGeomFromWKB_buf_r(geoshandle, (unsigned char *) 
geomWKB->data, geomWKB->len);
 
        if (geosGeometry != NULL)
                GEOSSetSRID_r(geoshandle, geosGeometry, geomWKB->srid);
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -2378,8 +2378,8 @@ geos2wkb(const GEOSGeometry *geosGeometr
                return wkbNULLcopy();
        }
 
-       GEOS_setWKBOutputDims(GEOSGeom_getCoordinateDimension_r(geoshandle, 
geosGeometry));
-       w = GEOSGeomToWKB_buf(geosGeometry, &wkbLen);
+       GEOS_setWKBOutputDims_r(geoshandle, 
GEOSGeom_getCoordinateDimension_r(geoshandle, geosGeometry));
+       w = GEOSGeomToWKB_buf_r(geoshandle, geosGeometry, &wkbLen);
 
        if (w == NULL)
                return NULL;
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org