From: Peter Kokot <peterkokot@gmail.com>
Date: Wed, 12 Jul 2017 19:42:06 +0000 (+0200)
Subject: Fixed bug #74906 redirecting incorrect include <sys/errno.h>
X-Git-Tag: php-7.2.0beta1~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9780d16376803744c77135e0a6ae149e88954dc4;p=php

Fixed bug #74906 redirecting incorrect include <sys/errno.h>
---

diff --git a/NEWS b/NEWS
index 3c55f0ae0e..4b3d6f92d3 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,7 @@ PHP                                                                        NEWS
     (Francois Laupretre)
   . 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 e911bf305f..d9a49fb01b 100644
--- a/ext/snmp/snmp.c
+++ b/ext/snmp/snmp.c
@@ -38,20 +38,15 @@
 #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"
 #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