e746e0d2a5
Builtbots currently fail to compile this package with (example message):
... /libevent-0.1.0/libevent.c:1403:42: error: 'EVBUFFER_READ' undeclared (first use in this function)
REGISTER_LONG_CONSTANT("EVBUFFER_READ", EVBUFFER_READ, CONST_CS | CONST_PERSISTENT);
With libevent2, the main include file event.h is deprecated, but includes
enough stuff and other compat includes that it _should work_. I could not figure
out why it fails (all locally builds work out-of-the-box), so this is a trial to
circumvent this compat header file and include the libevent2 headers directly.
While at, add a missing dependency to the sockets extension.
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
16 lines
602 B
Diff
16 lines
602 B
Diff
--- a/libevent.c
|
|
+++ b/libevent.c
|
|
@@ -42,10 +42,12 @@
|
|
(rsrc = (rsrc_type) zend_fetch_resource(passed_id TSRMLS_CC, default_id, resource_type_name, NULL, 1, resource_type))
|
|
#endif
|
|
|
|
-#ifdef PHP_WIN32
|
|
+//#ifdef PHP_WIN32
|
|
/* XXX compiling with 2.x on Windows. Luckily the ext code works thanks to the
|
|
compat exports from the libevent. However it might need to be adapted to the
|
|
never version, so this ifdefs would go away. */
|
|
+#if 1
|
|
+/* force use of libevent2 on OpenWrt and by-pass compat event.h */
|
|
# include <event2/event.h>
|
|
# include <event2/event_compat.h>
|
|
# include <event2/event_struct.h>
|