projects
/
m6w6
/
ext-http
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (from parent 1:
1cd8f8c
)
fix headers again, avoid header clashing including event2/*.h
author
Anatoliy Belsky
<ab@php.net>
Sat, 23 Nov 2013 08:38:45 +0000
(08:38 +0000)
committer
Anatoliy Belsky
<ab@php.net>
Sat, 23 Nov 2013 08:38:45 +0000
(08:38 +0000)
php_http_client_curl.c
patch
|
blob
|
history
diff --git
a/php_http_client_curl.c
b/php_http_client_curl.c
index 682e1eba2f64178eb8dba2884f115560fbfc1230..01e626d7385f7462868ee18e23fb9eeacd1d8ab4 100644
(file)
--- 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
#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)
# 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
# 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
# endif
# ifndef DBG_EVENTS
# define DBG_EVENTS 0