Make daniel's changes work in ZTS mode...

diff --git a/ext/curl/curl.c b/ext/curl/curl.c
index f04b076e31dc4275a059467e4375de87d22a3ec4..69b4a4dc6f87a3cb6abce8144fadb24163783db4 100644 (file)
--- a/ext/curl/curl.c
+++ b/ext/curl/curl.c
@@ -48,12 +48,6 @@
 #include "ext/standard/file.h"
 #include "php_curl.h"
 
-#ifdef ZTS
-int curl_globals_id;
-#else
-php_curl_globals curl_globals;
-#endif
-
 static int le_curl;
 
 static void _php_curl_close(zend_rsrc_list_entry *rsrc);
@@ -315,7 +309,7 @@ PHP_FUNCTION(curl_init)
 
                urlstr = estrndup(Z_STRVAL_PP(url), Z_STRLEN_PP(url));
                curl_easy_setopt(curl_handle->cp, CURLOPT_URL, urlstr);
-               zend_llist_add_element(&curl_handle->to_free,&urlstr);
+               zend_llist_add_element(&curl_handle->to_free, &urlstr);
        }
 
        curl_easy_setopt(curl_handle->cp, CURLOPT_NOPROGRESS, 1);
@@ -383,7 +377,7 @@ PHP_FUNCTION(curl_setopt)
                                copystr = estrndup(Z_STRVAL_PP(curl_value), Z_STRLEN_PP(curl_value));
                                
                                ret = curl_easy_setopt(curl_handle->cp, option, copystr);
-                               zend_llist_add_element(&curl_handle->to_free,&copystr);
+                               zend_llist_add_element(&curl_handle->to_free, &copystr);
                        }
                        break;
                        

diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h
index 10e10c82e44a6c9a102b8976c80a5b01856900e0..f0235bfeaaf41b40c5dcf361d718755808d9cc2b 100644 (file)
--- a/ext/curl/php_curl.h
+++ b/ext/curl/php_curl.h
@@ -60,16 +60,6 @@ typedef struct {
 } php_curl;
 
 
-
-#ifdef ZTS
-#define CURLG(v) (curl_globals->v)
-#define CURLLS_FETCH() php_curl_globals *curl_globals = ts_resource(curl_globals_id)
-#else
-#define CURLG(v) (curl_globals.v)
-#define CURLLS_FETCH()
-#endif
-
-
 #else
 #define curl_module_ptr NULL
 #endif /* HAVE_CURL */