com php-src: Fixed sockets ext build on win: ext/sockets/multicast.c ext/sockets/sockets.c

From: Date: Tue, 13 Nov 2012 13:53:32 +0000
Subject: com php-src: Fixed sockets ext build on win: ext/sockets/multicast.c ext/sockets/sockets.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-70524@lists.php.net to get a copy of this message
Commit: bc9f8030c7511b13ee151a7af15aaa5bd7ae42b5 Author: Anatoliy Belsky <ab@php.net> Tue, 13 Nov 2012 14:53:32 +0100 Parents: dae05b2973efb93b54b3f1a34b1d23a20c5943c3 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bc9f8030c7511b13ee151a7af15aaa5bd7ae42b5 Log: Fixed sockets ext build on win Changed paths: M ext/sockets/multicast.c M ext/sockets/sockets.c Diff: diff --git a/ext/sockets/multicast.c b/ext/sockets/multicast.c index 670d29f..e291060 100644 --- a/ext/sockets/multicast.c +++ b/ext/sockets/multicast.c @@ -38,6 +38,9 @@ # define NTDDI_XP NTDDI_WINXP /* bug in SDK */ # include <IPHlpApi.h> # undef NTDDI_XP +# if _WIN32_WINNT >= 0x0600 +# define HAVE_IF_NAMETOINDEX 1 +# endif #else #include <sys/socket.h> #include <sys/ioctl.h> diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index 4adb09f..1eee7a6 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -57,6 +57,7 @@ # define h_errno WSAGetLastError() # define set_errno(a) WSASetLastError(a) # define close(a) closesocket(a) +# include <IPHlpApi.h> # if _WIN32_WINNT >= 0x0600 # define HAVE_IF_NAMETOINDEX 1 # endif

« previous php.cvs (#70524) next »