svn commit: r892187 - in /apr/apr/trunk: configure.in include/apr.h.in include/apr.hw network_io/unix/multicast.c

[wr...@apache.org]

Author: wrowe
Date: Fri Dec 18 08:58:28 2009
New Revision: 892187

URL: http://svn.apache.org/viewvc?rev=892187&view=rev
Log:
Handle mswsock, ws2tcpip and winsock2 header files correctly

Modified:
    apr/apr/trunk/configure.in
    apr/apr/trunk/include/apr.h.in
    apr/apr/trunk/include/apr.hw
    apr/apr/trunk/network_io/unix/multicast.c

Modified: apr/apr/trunk/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/configure.in?rev=892187&r1=892186&r2=892187&view=diff
==============================================================================
--- apr/apr/trunk/configure.in (original)
+++ apr/apr/trunk/configure.in Fri Dec 18 08:58:28 2009
@@ -1224,6 +1224,7 @@
     mach-o/dyld.h	\
     malloc.h		\
     memory.h		\
+    mswsock.h		\
     netdb.h		\
     osreldate.h		\
     poll.h		\
@@ -1247,6 +1248,7 @@
     unix.h		\
     windows.h		\
     winsock2.h		\
+    ws2tcpip.h		\
     arpa/inet.h		\
     kernel/OS.h		\
     net/errno.h		\
@@ -1300,8 +1302,8 @@
 AC_SUBST(fcntlh)
 AC_SUBST(ioh)
 AC_SUBST(limitsh)
+AC_SUBST(mswsockh)
 AC_SUBST(netdbh)
-AC_SUBST(sys_syslimitsh)
 AC_SUBST(netinet_inh)
 AC_SUBST(netinet_sctph)
 AC_SUBST(netinet_sctp_uioh)
@@ -1317,6 +1319,7 @@
 AC_SUBST(sys_signalh)
 AC_SUBST(sys_socketh)
 AC_SUBST(sys_sockioh)
+AC_SUBST(sys_syslimitsh)
 AC_SUBST(sys_typesh)
 AC_SUBST(sys_timeh)
 AC_SUBST(sys_uioh)
@@ -1329,6 +1332,7 @@
 AC_SUBST(semaphoreh)
 AC_SUBST(windowsh)
 AC_SUBST(winsock2h)
+AC_SUBST(ws2tcpiph)
 
 # Checking for h_errno in <netdb.h>
 if test "$netdbh" = "1"; then

Modified: apr/apr/trunk/include/apr.h.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.h.in?rev=892187&r1=892186&r2=892187&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.h.in (original)
+++ apr/apr/trunk/include/apr.h.in Fri Dec 18 08:58:28 2009
@@ -78,6 +78,7 @@
 #define APR_HAVE_FCNTL_H         @fcntlh@
 #define APR_HAVE_IO_H            @ioh@
 #define APR_HAVE_LIMITS_H        @limitsh@
+#define APR_HAVE_MSWSOCK_H       @mswsockh@
 #define APR_HAVE_NETDB_H         @netdbh@
 #define APR_HAVE_NETINET_IN_H    @netinet_inh@
 #define APR_HAVE_NETINET_SCTP_H  @netinet_sctph@
@@ -108,6 +109,7 @@
 #define APR_HAVE_UNISTD_H        @unistdh@
 #define APR_HAVE_WINDOWS_H       @windowsh@
 #define APR_HAVE_WINSOCK2_H      @winsock2h@
+#define APR_HAVE_WS2TCPIP_H      @ws2tcpiph@
 
 /** @} */
 /** @} */
@@ -140,6 +142,13 @@
 #define NOIME
 #endif
 
+/* Impossible to include winsock2.h after winsock.h, while windows.h
+ * attempts to load winsock.  Setting _WINSOCKAPI_ will dodge this.
+ */
+#if APR_HAVE_WINSOCK2_H
+#define _WINSOCKAPI_
+#endif
+
 #include <windows.h>
 #endif
 #endif

Modified: apr/apr/trunk/include/apr.hw
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.hw?rev=892187&r1=892186&r2=892187&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.hw (original)
+++ apr/apr/trunk/include/apr.hw Fri Dec 18 08:58:28 2009
@@ -124,6 +124,7 @@
 #define APR_HAVE_FCNTL_H         APR_NOT_IN_WCE
 #define APR_HAVE_IO_H            APR_NOT_IN_WCE
 #define APR_HAVE_LIMITS_H        APR_NOT_IN_WCE
+#define APR_HAVE_MSWSOCK_H       APR_NOT_IN_WCE
 #define APR_HAVE_NETDB_H        0
 #define APR_HAVE_NETINET_IN_H   0
 #define APR_HAVE_NETINET_SCTP_H 0
@@ -154,6 +155,7 @@
 #define APR_HAVE_UNISTD_H       0
 #define APR_HAVE_WINDOWS_H       1
 #define APR_HAVE_WINSOCK2_H      APR_NOT_IN_WCE
+#define APR_HAVE_WS2TCPIP_H      APR_NOT_IN_WCE
 
 /** @} */
 /** @} */
@@ -186,6 +188,13 @@
 #define NOIME
 #endif
 
+/* Impossible to include winsock2.h after winsock.h, while windows.h 
+ * attempts to load winsock.  Setting _WINSOCKAPI_ will dodge this.
+ */
+#if APR_HAVE_WINSOCK2_H
+#define _WINSOCKAPI_
+#endif
+
 #include <windows.h>
 #endif
 #endif

Modified: apr/apr/trunk/network_io/unix/multicast.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/network_io/unix/multicast.c?rev=892187&r1=892186&r2=892187&view=diff
==============================================================================
--- apr/apr/trunk/network_io/unix/multicast.c (original)
+++ apr/apr/trunk/network_io/unix/multicast.c Fri Dec 18 08:58:28 2009
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "apr.h"
 #include "apr_arch_networkio.h"
 #include "apr_network_io.h"
 #include "apr_support.h"