Hi,
On Windows, building Subversion with IPv6 support enabled currently
fails because two windows specific files don't include winsock2.h before
windows.h. The attached patch fixes this.
Stefan
P.S. There's also one change needed to the apr libraries (the file
misc/win32/rand.c needs to include "apr.h" *before* windows.h) to get
the build running. But once that include line is moved two lines up, it
works.
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
[[[
Fix to build Subversion with IPv6 support on Windows:
include the <winsock2.h> header file before <windows.h>.
* subversion/libsvn_subr/config_win.c,
subversion/libsvn_subr/win32_xlate.c
]]]
Index: subversion/libsvn_subr/config_win.c
===================================================================
--- subversion/libsvn_subr/config_win.c (revision 27550)
+++ subversion/libsvn_subr/config_win.c (working copy)
@@ -21,8 +21,10 @@
#include "svn_private_config.h"
#ifdef WIN32
-
#define WIN32_LEAN_AND_MEAN
+#ifdef APR_HAVE_IPV6
+#include <winsock2.h>
+#endif
#include <windows.h>
#include <shlobj.h>
Index: subversion/libsvn_subr/win32_xlate.c
===================================================================
--- subversion/libsvn_subr/win32_xlate.c (revision 27550)
+++ subversion/libsvn_subr/win32_xlate.c (working copy)
@@ -21,6 +21,9 @@
/* Define _WIN32_DCOM for CoInitializeEx(). */
#define _WIN32_DCOM
+#ifdef APR_HAVE_IPV6
+#include <winsock2.h>
+#endif
#include <windows.h>
#include <mlang.h>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Nov 2 16:54:05 2007