Re: svn commit: r32836 - in trunk/subversion: libsvn_ra_serf libsvn_subr

[Stefan Sperling <st...@elego.de>]

On Sat, Aug 30, 2008 at 02:51:23PM -0700, rhuijben@tigris.org wrote:
> Author: rhuijben
> Date: Sat Aug 30 14:51:22 2008
> New Revision: 32836
> 
> Log:
> Rely on apr.h's APR_HAVE_IPV6 setting for enabling Windows ipv6 support.
> 
> Before this patch only custom builds setting APR_HAVE_IPV6 to 1 before 
> including apr.h could really enable ipv6 support on Windows.
> 
> * subversion/libsvn_ra_serf/win32_auth_sspi.c
>   (includes): Include apr.h instead of using custom ipv6 includes.
> * subversion/libsvn_subr/win32_crashrpt.c
>   (includes): Include apr.h instead of using custom ipv6 includes.
>   
> * subversion/libsvn_subr/config_win.c
>   (includes): Include windows.h via winsock headers to resolve ipv6
>     compilation errors.
> * subversion/libsvn_subr/win32_xlate.c
>   (includes): Include windows.h via winsock headers to resolve ipv6
>     compilation errors.
> 
> Modified:
>    trunk/subversion/libsvn_ra_serf/win32_auth_sspi.c
>    trunk/subversion/libsvn_subr/config_win.c
>    trunk/subversion/libsvn_subr/win32_crashrpt.c
>    trunk/subversion/libsvn_subr/win32_xlate.c
> 
> Modified: trunk/subversion/libsvn_ra_serf/win32_auth_sspi.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_ra_serf/win32_auth_sspi.c?pathrev=32836&r1=32835&r2=32836
> ==============================================================================
> --- trunk/subversion/libsvn_ra_serf/win32_auth_sspi.c	Sat Aug 30 11:22:04 2008	(r32835)
> +++ trunk/subversion/libsvn_ra_serf/win32_auth_sspi.c	Sat Aug 30 14:51:22 2008	(r32836)
> @@ -53,16 +53,9 @@
>   */
>  
>  /*** Includes ***/
> -#ifdef WIN32
> -#ifdef APR_HAVE_IPV6
> -#include <winsock2.h>
> -#include <Ws2tcpip.h>
> -#include <Wspiapi.h>
> -#endif
> -#include <windows.h>
> -#endif
>  #include <string.h>
>  
> +#include <apr.h>
>  #include <apr_base64.h>
>  
>  #include "svn_error.h"
> 
> Modified: trunk/subversion/libsvn_subr/config_win.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_subr/config_win.c?pathrev=32836&r1=32835&r2=32836
> ==============================================================================
> --- trunk/subversion/libsvn_subr/config_win.c	Sat Aug 30 11:22:04 2008	(r32835)
> +++ trunk/subversion/libsvn_subr/config_win.c	Sat Aug 30 14:51:22 2008	(r32836)
> @@ -21,8 +21,15 @@
>  #include "svn_private_config.h"
>  
>  #ifdef WIN32
> +/* We must include windows.h ourselves or apr.h includes it for us with
> +   many ignore options set. Including Winsock is required to resolve IPv6
> +   compilation errors. APR_HAVE_IPV6 is only defined after including
> +   apr.h, so we can't detect this case here. */
> +
>  #define WIN32_LEAN_AND_MEAN
> -#include <windows.h>
> +#include <winsock2.h>
> +#include <Ws2tcpip.h>
> +
>  #include <shlobj.h>

The comment above says that we "must include windows.h ourselves" while the
direct include of windows.h is removed by the diff.
This looks a bit contradictory.

The log message says "Include windows.h via winsock headers ..."

Should the comment be updated to mention that the inclusion of
windows.h is indirect?

>  
>  #include <apr_file_info.h>
> 
> Modified: trunk/subversion/libsvn_subr/win32_crashrpt.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_subr/win32_crashrpt.c?pathrev=32836&r1=32835&r2=32836
> ==============================================================================
> --- trunk/subversion/libsvn_subr/win32_crashrpt.c	Sat Aug 30 11:22:04 2008	(r32835)
> +++ trunk/subversion/libsvn_subr/win32_crashrpt.c	Sat Aug 30 14:51:22 2008	(r32836)
> @@ -20,10 +20,7 @@
>  #ifdef SVN_USE_WIN32_CRASHHANDLER
>  
>  /*** Includes. ***/
> -#ifdef APR_HAVE_IPV6
> -#include <winsock2.h>
> -#endif
> -#include <windows.h>
> +#include <apr.h>
>  #include <dbghelp.h>
>  #include <stdio.h>
>  #include <stdlib.h>
> 
> Modified: trunk/subversion/libsvn_subr/win32_xlate.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_subr/win32_xlate.c?pathrev=32836&r1=32835&r2=32836
> ==============================================================================
> --- trunk/subversion/libsvn_subr/win32_xlate.c	Sat Aug 30 11:22:04 2008	(r32835)
> +++ trunk/subversion/libsvn_subr/win32_xlate.c	Sat Aug 30 14:51:22 2008	(r32836)
> @@ -21,12 +21,13 @@
>  /* Define _WIN32_DCOM for CoInitializeEx(). */
>  #define _WIN32_DCOM
>  
> -#ifdef APR_HAVE_IPV6
> +/* We must include windows.h ourselves or apr.h includes it for us with
> +   many ignore options set. Including Winsock is required to resolve IPv6
> +   compilation errors. APR_HAVE_IPV6 is only defined after including
> +   apr.h, so we can't detect this case here. */
> +
>  #include <winsock2.h>
>  #include <Ws2tcpip.h>
> -#include <Wspiapi.h>
> -#endif
> -#include <windows.h>
>  #include <mlang.h>

Same here.

Stefan

>  
>  #include <apr.h>
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org