X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_client_curl_event.c;h=e1ba505b783d828ec92ca25d576f2432e394afdd;hp=058c51f831cdcb6d64bce28da87cf8ba8d858787;hb=43a9a6f8cb56e25c3770d652ce77045f89f68ca6;hpb=a1d6c90d8630ec1385f10052656d129498720adf

diff --git a/src/php_http_client_curl_event.c b/src/php_http_client_curl_event.c
index 058c51f..e1ba505 100644
--- a/src/php_http_client_curl_event.c
+++ b/src/php_http_client_curl_event.c
@@ -11,8 +11,6 @@
 */
 
 #include "php_http_api.h"
-#include "php_http_client.h"
-#include "php_http_client_curl.h"
 
 #if PHP_HTTP_HAVE_CURL
 #if PHP_HTTP_HAVE_EVENT
@@ -67,7 +65,6 @@ static void php_http_client_curl_event_handler(void *context, curl_socket_t s, i
 	CURLMcode rc;
 	php_http_client_curl_event_context_t *ctx = context;
 	php_http_client_curl_t *curl = ctx->client->ctx;
-	TSRMLS_FETCH_FROM_CTX(ctx->client->ts);
 
 #if DBG_EVENTS
 	fprintf(stderr, "H");
@@ -78,7 +75,7 @@ static void php_http_client_curl_event_handler(void *context, curl_socket_t s, i
 	} while (CURLM_CALL_MULTI_PERFORM == rc);
 
 	if (CURLM_OK != rc) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s",  curl_multi_strerror(rc));
+		php_error_docref(NULL, E_WARNING, "%s",  curl_multi_strerror(rc));
 	}
 
 	php_http_client_curl_responsehandler(ctx->client);
@@ -144,7 +141,6 @@ static int php_http_client_curl_event_socket(CURL *easy, curl_socket_t sock, int
 	php_http_client_curl_t *curl = ctx->client->ctx;
 	int events = EV_PERSIST;
 	php_http_client_curl_event_ev_t *ev = assign_data;
-	TSRMLS_FETCH_FROM_CTX(ctx->client->ts);
 
 #if DBG_EVENTS
 	fprintf(stderr, "S");
@@ -176,7 +172,7 @@ static int php_http_client_curl_event_socket(CURL *easy, curl_socket_t sock, int
 			return 0;
 
 		default:
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown socket action %d", action);
+			php_error_docref(NULL, E_WARNING, "Unknown socket action %d", action);
 			return -1;
 	}
 
@@ -235,7 +231,6 @@ static ZEND_RESULT_CODE php_http_client_curl_event_exec(void *context)
 {
 	php_http_client_curl_event_context_t *ctx = context;
 	php_http_client_curl_t *curl = ctx->client->ctx;
-	TSRMLS_FETCH_FROM_CTX(ctx->client->ts);
 
 #if DBG_EVENTS
 	fprintf(stderr, "E");