com php-src: Fixed bug #74906 redirecting incorrect include <sys/errno.h>: NEWS ext/snmp/snmp.c

Commit: 4d08b9dac0d42d93ed1c6f0617e1426f013b981f Author: Peter Kokot <peterkokot@gmail.com> Wed, 12 Jul 2017 00:41:43 +0200 Committer: Joe Watkins <krakjoe@php.net> Mon, 17 Jul 2017 06:54:27 +0100 Parents: 0db20a7cb1648420fbec2ea7895e4ac4bc68e634 Branches: PHP-7.0 PHP-7..1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4d08b9dac0d42d93ed1c6f0617e1426f013b981f 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 19dc268..b3c9d6f 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 7e29999..1605f0c 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