From: Anatoliy Belsky <ab@php.net>
Date: Sat, 23 Nov 2013 08:38:45 +0000 (+0000)
Subject: fix headers again, avoid header clashing including event2/*.h
X-Git-Tag: RELEASE_2_0_1~6
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=b91a5aa0a66b844f6691fa457f6767817ced2410;p=m6w6%2Fext-http

fix headers again, avoid header clashing including event2/*.h
---

diff --git a/php_http_client_curl.c b/php_http_client_curl.c
index 682e1eb..01e626d 100644
--- a/php_http_client_curl.c
+++ b/php_http_client_curl.c
@@ -16,15 +16,20 @@
 #if PHP_HTTP_HAVE_CURL
 
 #if PHP_HTTP_HAVE_EVENT
-#	include <event.h>
 #	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
-#	    include <event_struct.h>
+#       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