X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.c;h=471ee80f4717b4f8b2693ed1293fade3d4e61a25;hp=2ed94c8e1bf78cdf231445735a29ec05ffc64d70;hb=4b123a5347d0f16003feb045a5304bbb91630d74;hpb=87db9817d428282792c8146d9c2ae9748ebf6f1e

diff --git a/php_http.c b/php_http.c
index 2ed94c8..471ee80 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
@@ -73,7 +78,7 @@ zend_module_entry http_module_entry = {
 	PHP_RINIT(http),
 	PHP_RSHUTDOWN(http),
 	PHP_MINFO(http),
-	PHP_HTTP_EXT_VERSION,
+	PHP_PECL_HTTP_VERSION,
 	STANDARD_MODULE_PROPERTIES
 };
 
@@ -217,7 +222,7 @@ PHP_MINFO_FUNCTION(http)
 
 	php_info_print_table_start();
 	php_info_print_table_header(2, "HTTP Support", "enabled");
-	php_info_print_table_row(2, "Extension Version", PHP_HTTP_EXT_VERSION);
+	php_info_print_table_row(2, "Extension Version", PHP_PECL_HTTP_VERSION);
 	php_info_print_table_end();
 	
 	php_info_print_table_start();