--- /branches/3.4/NEWS	(revision 4019)
+++ /branches/3.4/NEWS	(revision 4020)
@@ -3,4 +3,5 @@ 
 
 - Bug fixes / improvements
+ - Fixed compilation against thread-safe PHP (#541)
  - Fix Empty to Empty equals (#703)
  - Fix build on OpenBSD (#700)
--- /branches/3.4/php/geos.c	(revision 4019)
+++ /branches/3.4/php/geos.c	(revision 4020)
@@ -79,4 +79,5 @@ 
 static void noticeHandler(const char *fmt, ...)
 {
+    TSRMLS_FETCH();
     char message[256];
     va_list args;
@@ -90,4 +91,5 @@ 
 static void errorHandler(const char *fmt, ...)
 {
+    TSRMLS_FETCH();
     char message[256];
     va_list args;
@@ -97,5 +99,5 @@ 
 
     /* TODO: use a GEOSException ? */
-    zend_throw_exception_ex(zend_exception_get_default(TSRMLS_CC),
+    zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C),
         1 TSRMLS_CC, "%s", message); 
 
@@ -109,4 +111,5 @@ 
 static void 
 setRelay(zval* val, void* obj) {
+    TSRMLS_FETCH();
     Proxy* proxy = (Proxy*)zend_object_store_get_object(val TSRMLS_CC);
     proxy->relay = obj;
@@ -115,4 +118,5 @@ 
 static inline void *
 getRelay(zval* val, zend_class_entry* ce) {
+    TSRMLS_FETCH();
     Proxy *proxy =  (Proxy*)zend_object_store_get_object(val TSRMLS_CC);
     if ( proxy->std.ce != ce ) {
@@ -154,7 +158,8 @@ 
 
 static zend_object_value
-Gen_create_obj (zend_class_entry *type TSRMLS_DC,
+Gen_create_obj (zend_class_entry *type,
     zend_objects_free_object_storage_t st, zend_object_handlers* handlers)
 {
+    TSRMLS_FETCH();
     zval *tmp;
     zend_object_value retval;
@@ -412,4 +417,5 @@ 
 dumpGeometry(GEOSGeometry* g, zval* array)
 {
+    TSRMLS_FETCH();
     int ngeoms, i;