[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] fix build on windows with IPv6 included

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-12-02 18:17:22 CET

Hi,

The latest trunk doesn't compile on Windows with IPv6 enabled.
The attached patch fixes the problem.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net

[[[
Fix the Windows build with IPv6 by including the required header files
before <windows.h>

* subversion/libsvn_ra_serf/util.c,
  subversion/libsvn_ra_serf/win32_auth_sspi.c
  subversion/libsvn_subr/config_win.c
  subversion/libsvn_subr/win32_xlate.c : include required header files
]]]
Index: subversion/libsvn_ra_serf/util.c
===================================================================
--- subversion/libsvn_ra_serf/util.c (revision 28184)
+++ subversion/libsvn_ra_serf/util.c (working copy)
@@ -19,6 +19,7 @@
 
 
 #define APR_WANT_STRFUNC
+#include <apr.h>
 #include <apr_want.h>
 
 #include <serf.h>
Index: subversion/libsvn_ra_serf/win32_auth_sspi.c
===================================================================
--- subversion/libsvn_ra_serf/win32_auth_sspi.c (revision 28184)
+++ subversion/libsvn_ra_serf/win32_auth_sspi.c (working copy)
@@ -54,6 +54,11 @@
 
 /*** Includes ***/
 #ifdef WIN32
+#ifdef APR_HAVE_IPV6
+#include "winsock2.h"
+#include "Ws2tcpip.h"
+#include "Wspiapi.h"
+#endif
 #include <windows.h>
 #endif
 #include <string.h>
Index: subversion/libsvn_subr/config_win.c
===================================================================
--- subversion/libsvn_subr/config_win.c (revision 28184)
+++ subversion/libsvn_subr/config_win.c (working copy)
@@ -23,7 +23,9 @@
 #ifdef WIN32
 #define WIN32_LEAN_AND_MEAN
 #ifdef APR_HAVE_IPV6
-#include <winsock2.h>
+#include "winsock2.h"
+#include "Ws2tcpip.h"
+#include "Wspiapi.h"
 #endif
 #include <windows.h>
 #include <shlobj.h>
@@ -344,3 +346,6 @@
 }
 
 #endif /* WIN32 */
+
+
+
Index: subversion/libsvn_subr/win32_xlate.c
===================================================================
--- subversion/libsvn_subr/win32_xlate.c (revision 28184)
+++ subversion/libsvn_subr/win32_xlate.c (working copy)
@@ -22,7 +22,9 @@
 #define _WIN32_DCOM
 
 #ifdef APR_HAVE_IPV6
-#include <winsock2.h>
+#include "winsock2.h"
+#include "Ws2tcpip.h"
+#include "Wspiapi.h"
 #endif
 #include <windows.h>
 #include <mlang.h>
@@ -216,3 +218,6 @@
 }
 
 #endif /* WIN32 */
+
+
+

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Dec 2 18:17:46 2007

This is an archived mail posted to the Subversion Dev mailing list.