X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_client_curl_event.c;h=b8db1b2d5e15c33429b1c6f6cdc7c06da70ff201;hp=21f5c9cfe20596b30325cf6254a8c1ac871210ce;hb=a25866b2177031ae8f5142db8a45fd58dad4e161;hpb=3d6646aaa19df97351eac93369c012d39cb74031

diff --git a/src/php_http_client_curl_event.c b/src/php_http_client_curl_event.c
index 21f5c9c..b8db1b2 100644
--- a/src/php_http_client_curl_event.c
+++ b/src/php_http_client_curl_event.c
@@ -11,29 +11,14 @@
 */
 
 #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
-#	if !PHP_HTTP_HAVE_EVENT2 && /* just be really sure */ !(LIBEVENT_VERSION_NUMBER >= 0x02000000)
-#		include <event.h>
-#		define event_base_new event_init
-#		define event_assign(e, b, s, a, cb, d) do {\
-			event_set(e, s, a, cb, d); \
-			event_base_set(b, e); \
-		} while(0)
-#	else
-#		if PHP_HTTP_HAVE_EVENT2
-#			include <event2/event.h>
-#			include <event2/event_struct.h>
-#		else
-#			error "libevent presence is unknown"
-#		endif
-#	endif
-#	ifndef DBG_EVENTS
-#		define DBG_EVENTS 0
-#	endif
+
+#if PHP_HTTP_HAVE_LIBCURL
+#if PHP_HTTP_HAVE_LIBEVENT
+
+#include <event.h>
+#ifndef DBG_EVENTS
+#	define DBG_EVENTS 0
+#endif
 
 typedef struct php_http_client_curl_event_context {
 	php_http_client_t *client;
@@ -67,7 +52,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 +62,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);
@@ -153,7 +137,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");
@@ -185,7 +168,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;
 	}
 
@@ -244,7 +227,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");
@@ -328,8 +310,8 @@ php_http_client_curl_ops_t *php_http_client_curl_event_ops_get()
 	return &php_http_client_curl_event_ops;
 }
 
-#endif /* PHP_HTTP_HAVE_EVENT */
-#endif /* PHP_HTTP_HAVE_CURL */
+#endif /* PHP_HTTP_HAVE_LIBEVENT */
+#endif /* PHP_HTTP_HAVE_LIBCURL */
 
 /*
  * Local variables: