summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2017-07-12 00:41:43 +0200
committerJoe Watkins <krakjoe@php.net>2017-07-17 06:54:27 +0100
commit4d08b9dac0d42d93ed1c6f0617e1426f013b981f (patch)
treea9cc1821cfce2a09945525a6d989b504e7b56471
parent0db20a7cb1648420fbec2ea7895e4ac4bc68e634 (diff)
downloadphp-git-4d08b9dac0d42d93ed1c6f0617e1426f013b981f.tar.gz
Fixed bug #74906 redirecting incorrect include <sys/errno.h>
-rw-r--r--NEWS1
-rw-r--r--ext/snmp/snmp.c8
2 files changed, 2 insertions, 7 deletions
diff --git a/NEWS b/NEWS
index 19dc26829b..b3c9d6fb9d 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ PHP NEWS
. Fixed bug #74761 (Unary operator expected error on some systems). (petk)
. Fixed bug #73900 (Use After Free in unserialize() SplFixedArray). (nikic)
. 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 7e299999a6..1605f0c6eb 100644
--- a/ext/snmp/snmp.c
+++ b/ext/snmp/snmp.c
@@ -41,9 +41,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)
@@ -52,17 +52,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