X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http.c;h=91a10e9615de60e95184cd1d2588d759316fabce;hb=71404a21e0937944e47a760e8736905c75f903ea;hp=4efec72d613f6667c0594411aa6204028e3a8009;hpb=c1231f62c6f4ae58cc63bc3724f99d5fb207b83a;p=m6w6%2Fext-http

diff --git a/php_http.c b/php_http.c
index 4efec72..91a10e9 100644
--- a/php_http.c
+++ b/php_http.c
@@ -20,7 +20,12 @@
 #if PHP_HTTP_HAVE_CURL
 #	include <curl/curl.h>
 #	if PHP_HTTP_HAVE_EVENT
-#		include <event.h>
+#		if PHP_HTTP_HAVE_EVENT2
+#			include <event2/event.h>
+#			include <event2/event_struct.h>
+#		else
+#			include <event.h>
+#		endif
 #	endif
 #endif
 #if PHP_HTTP_HAVE_SERF
@@ -55,9 +60,6 @@ static zend_module_dep http_module_deps[] = {
 #endif
 #ifdef PHP_HTTP_HAVE_JSON
 	ZEND_MOD_REQUIRED("json")
-#endif
-#ifdef PHP_HTTP_HAVE_EVENT
-	ZEND_MOD_CONFLICTS("event")
 #endif
 	{NULL, NULL, NULL, 0}
 };