diff options
| author | Remi Collet <remi@remirepo.net> | 2018-05-29 15:36:48 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2018-05-29 15:36:48 +0200 |
| commit | f47a1efa49aebcbd619979ac12904b18c926ef98 (patch) | |
| tree | 5c393c9b5163a78354691bcdb09bf82934724ea7 /21.patch | |
| parent | 34238bc578c3aa8b6c55a78934266de71f91efb2 (diff) | |
update to 2.4.0
drop patches merged upstream
Diffstat (limited to '21.patch')
| -rw-r--r-- | 21.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/21.patch b/21.patch deleted file mode 100644 index c5b6154..0000000 --- a/21.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 6bbad6ea8b3c0d2a75dfc8af983d217fd30f71c1 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Thu, 22 Mar 2018 13:53:35 +0100 -Subject: [PATCH] fix buld warning [-Wimplicit-function-declaration] - ---- - config.m4 | 1 + - nsq.c | 3 +++ - 2 files changed, 4 insertions(+) - -diff --git a/config.m4 b/config.m4 -index 9af9b72..0366929 100644 ---- a/config.m4 -+++ b/config.m4 -@@ -66,6 +66,7 @@ echo "libevent-path:$LIBEVENT_DIR"; - -l$LIBNAME - ]) - -+ AC_CHECK_HEADERS([sys/wait.h]) - - - dnl PHP_ADD_EXTENSION_DEP(libevent, sockets, true) -diff --git a/nsq.c b/nsq.c -index df15306..ef0af68 100644 ---- a/nsq.c -+++ b/nsq.c -@@ -37,6 +37,9 @@ - #include "nsq_lookupd.h" - #include "zend_exceptions.h" - -+#ifdef HAVE_SYS_WAIT_H -+#include "sys/wait.h" -+#endif - - /* If you declare any globals in php_nsq.h uncomment this: - ZEND_DECLARE_MODULE_GLOBALS(nsq) |