diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-07-17 06:54:46 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-07-17 06:55:02 +0100 |
| commit | e0282c3b585fa24880d005d3b0a9ec7bdb469abc (patch) | |
| tree | c548f1b91f5d2a47f186ccd34f956319f099ac22 | |
| parent | 2e82ed9b7326cf8bf716efcdb600937b626a80b2 (diff) | |
| parent | 4d08b9dac0d42d93ed1c6f0617e1426f013b981f (diff) | |
| download | php-git-e0282c3b585fa24880d005d3b0a9ec7bdb469abc.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74906 redirecting incorrect include <sys/errno.h>
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/snmp/snmp.c | 8 |
2 files changed, 2 insertions, 7 deletions
@@ -11,6 +11,7 @@ PHP NEWS . Fixed bug #73900 (Use After Free in unserialize() SplFixedArray). (nikic) . Fixed bug #74923 (Crash when crawling through network share). (Anatol) . Fixed bug #74913 (fixed incorrect poll.h include). (petk) + . Fixed bug #74906 (fixed incorrect errno.h include). (petk) - Date: . Fixed bug #74852 (property_exists returns true on unknown DateInterval diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c index e60dfaffcb..cc6b4ea455 100644 --- a/ext/snmp/snmp.c +++ b/ext/snmp/snmp.c @@ -38,9 +38,9 @@ #if HAVE_SNMP #include <sys/types.h> +#include <errno.h> #ifdef PHP_WIN32 #include <winsock2.h> -#include <errno.h> #include <process.h> #include "win32/time.h" #elif defined(NETWARE) @@ -49,17 +49,11 @@ #else #include <sys/socket.h> #endif -#include <errno.h> #include <sys/timeval.h> #else #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> -#ifndef _OSD_POSIX -#include <sys/errno.h> -#else -#include <errno.h> /* BS2000/OSD uses <errno.h>, not <sys/errno.h> */ -#endif #include <netdb.h> #endif #ifdef HAVE_UNISTD_H |