From: Gustavo Lopes <glopes@nebm.ist.utl.pt>
Date: Thu, 31 Jan 2013 15:34:46 +0000 (+0100)
Subject: Fix multicast.c not defining errno on Windows
X-Git-Tag: php-5.5.0alpha5~43^2~11^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2fc17c833c5122327438c82fc0dc4b689268f59;p=php

Fix multicast.c not defining errno on Windows

Small cleanups in includes as well.
---

diff --git a/ext/sockets/multicast.c b/ext/sockets/multicast.c
index 5d29c9c5e2..c6de3198e4 100644
--- a/ext/sockets/multicast.c
+++ b/ext/sockets/multicast.c
@@ -28,19 +28,7 @@
 
 #include "php_network.h"
 #ifdef PHP_WIN32
-# include "win32/inet.h"
-# include <winsock2.h>
-# include <windows.h>
-# include <Ws2tcpip.h>
-# include <Ws2ipdef.h>
-# include "php_sockets.h"
-# include "win32/sockets.h"
-# define NTDDI_XP NTDDI_WINXP /* bug in SDK */
-# include <IPHlpApi.h>
-# undef NTDDI_XP
-# if _WIN32_WINNT >= 0x0600
-#  define HAVE_IF_NAMETOINDEX 1
-# endif
+# include "windows_common.h"
 #else
 #include <sys/socket.h>
 #include <sys/ioctl.h>
diff --git a/ext/sockets/sockaddr_conv.h b/ext/sockets/sockaddr_conv.h
index 665c73913f..8e51edac8f 100644
--- a/ext/sockets/sockaddr_conv.h
+++ b/ext/sockets/sockaddr_conv.h
@@ -1,7 +1,6 @@
 #ifndef PHP_SOCKADR_CONV_H
 #define PHP_SOCKADR_CONV_H
 
-#define HAVE_SOCKETS 1
 #include <php_network.h>
 #include "php_sockets.h" /* php_socket */
 
diff --git a/ext/sockets/windows_common.h b/ext/sockets/windows_common.h
index 1dc966ac00..c72c6987e6 100644
--- a/ext/sockets/windows_common.h
+++ b/ext/sockets/windows_common.h
@@ -17,7 +17,9 @@
 #define WINDOWS_COMMON_H
 
 #include <Winsock2.h>
+#define NTDDI_XP NTDDI_WINXP /* bug in SDK */
 #include <IPHlpApi.h> /* conflicting definition of CMSG_DATA */
+#undef NTDDI_XP
 
 #define HAVE_IF_NAMETOINDEX 1