com php-src: Fixed bug #74906 redirecting incorrect include <sys/errno.h>: NEWS ext/snmp/snmp.c
| From: | Joe Watkins | Date: | Mon, 17 Jul 2017 05:56:59 +0000 |
| Subject: | com php-src: Fixed bug #74906 redirecting incorrect include <sys/errno.h>: NEWS ext/snmp/snmp.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98581@lists.php.net to get a copy of this message | ||
Commit: 9780d16376803744c77135e0a6ae149e88954dc4
Author: Peter Kokot <peterkokot@gmail.com> Wed, 12 Jul 2017 21:42:06 +0200
Committer: Joe Watkins <krakjoe@php.net> Mon, 17 Jul 2017 06:56:59 +0100
Parents: 876941cae2f48ed0715f7cd39691542fd5e9cfdb
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9780d16376803744c77135e0a6ae149e88954dc4
Log:
Fixed bug #74906 redirecting incorrect include <sys/errno.h>
Bugs:
https://bugs.php.net/74906
Changed paths:
M NEWS
M ext/snmp/snmp.c
Diff:
diff --git a/NEWS b/NEWS
index 3c55f0a..4b3d6f9 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 e911bf3..d9a49fb 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