[geos-commits] r2909 - trunk/capi

[svn_geos at osgeo.org]

Author: strk
Date: 2010-02-11 03:18:44 -0500 (Thu, 11 Feb 2010)
New Revision: 2909

Modified:
   trunk/capi/geos_c.h.in
   trunk/capi/geos_ts_c.cpp
Log:
Go for consistency with reentrant interfaces [RT-SIGTA]

Modified: trunk/capi/geos_c.h.in
===================================================================
--- trunk/capi/geos_c.h.in	2010-02-11 00:10:30 UTC (rev 2908)
+++ trunk/capi/geos_c.h.in	2010-02-11 08:18:44 UTC (rev 2909)
@@ -153,10 +153,10 @@
                                     GEOSMessageHandler error_function);
 extern void GEOS_DLL finishGEOS_r(GEOSContextHandle_t handle);
 
-extern GEOSMessageHandler GEOS_DLL GEOSContext_setNoticeHandler(GEOSContextHandle_t extHandle,
-                                                                GEOSMessageHandler nf);
-extern GEOSMessageHandler GEOS_DLL GEOSContext_setErrorHandler(GEOSContextHandle_t extHandle,
-                                                               GEOSMessageHandler nf);
+extern GEOSMessageHandler GEOS_DLL GEOSContext_setNoticeHandler_r(GEOSContextHandle_t extHandle,
+                                                                  GEOSMessageHandler nf);
+extern GEOSMessageHandler GEOS_DLL GEOSContext_setErrorHandler_r(GEOSContextHandle_t extHandle,
+                                                                 GEOSMessageHandler nf);
 
 extern const char GEOS_DLL *GEOSversion();
 

Modified: trunk/capi/geos_ts_c.cpp
===================================================================
--- trunk/capi/geos_ts_c.cpp	2010-02-11 00:10:30 UTC (rev 2908)
+++ trunk/capi/geos_ts_c.cpp	2010-02-11 08:18:44 UTC (rev 2909)
@@ -189,7 +189,7 @@
 }
 
 GEOSMessageHandler
-GEOSContext_setNoticeHandler(GEOSContextHandle_t extHandle, GEOSMessageHandler nf)
+GEOSContext_setNoticeHandler_r(GEOSContextHandle_t extHandle, GEOSMessageHandler nf)
 {
     GEOSMessageHandler f;
     GEOSContextHandleInternal_t *handle = 0;
@@ -206,7 +206,7 @@
 }
 
 GEOSMessageHandler
-GEOSContext_setErrorHandler(GEOSContextHandle_t extHandle, GEOSMessageHandler nf)
+GEOSContext_setErrorHandler_r(GEOSContextHandle_t extHandle, GEOSMessageHandler nf)
 {
     GEOSMessageHandler f;
     GEOSContextHandleInternal_t *handle = 0;