subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Paul Burba <ptbu...@gmail.com>
Subject Re: svn commit: r40510(r880584) - in trunk: . subversion subversion/include
Date Mon, 16 Nov 2009 19:16:27 GMT
On Sat, Nov 14, 2009 at 2:42 PM, Arfrever Frehtes Taifersar Arahesis
<Arfrever.FTA@gmail.com> wrote:
> Author: arfrever
> Date: Sat Nov 14 11:42:26 2009
> New Revision: 40510
>
> Log:
> Move inclusion of svn_debug.h from svn_types.h to svn_private_config.h.
>
> * subversion/include/svn_types.h: Don't include "private/svn_debug.h".
>
> * configure.ac: Include "private/svn_debug.h" in generated svn_private_config.h.in
>   file.
>
> * subversion/svn_private_config.hw: Include "private/svn_debug.h".
>
> Review by: gstein
>
> Modified:
>   trunk/configure.ac
>   trunk/subversion/include/svn_types.h
>   trunk/subversion/svn_private_config.hw
>
> Modified: trunk/configure.ac
> URL: http://svn.collab.net/viewvc/svn/trunk/configure.ac?pathrev=40510&r1=40509&r2=40510
> ==============================================================================
> --- trunk/configure.ac  Sat Nov 14 00:02:24 2009        (r40509)
> +++ trunk/configure.ac  Sat Nov 14 11:42:26 2009        (r40510)
> @@ -615,7 +615,15 @@ if test "$enable_nls" = "yes"; then
>   fi
>  fi
>
> -AH_BOTTOM(
> +AH_BOTTOM([/*
> + * Subversion developers may want to use some additional debugging facilities
> + * while working on the code. We'll pull that in here, so individual source
> + * files don't have to include this header manually.
> + */
> +#ifdef SVN_DEBUG
> +#include "private/svn_debug.h"
> +#endif
> +
>  #define N_(x) x
>  #define U_(x) x
>  #ifdef ENABLE_NLS
> @@ -629,7 +637,7 @@ AH_BOTTOM(
>  #define gettext(x) (x)
>  #define dgettext(domain, x) (x)
>  #endif
> -)
> +])
>
>  dnl Used to simulate makefile conditionals.
>  GETTEXT_CODESET=\#
>
> Modified: trunk/subversion/include/svn_types.h
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/include/svn_types.h?pathrev=40510&r1=40509&r2=40510
> ==============================================================================
> --- trunk/subversion/include/svn_types.h        Sat Nov 14 00:02:24 2009      
 (r40509)
> +++ trunk/subversion/include/svn_types.h        Sat Nov 14 11:42:26 2009      
 (r40510)
> @@ -1144,14 +1144,4 @@ typedef unsigned long svn_linenum_t;
>  #include "svn_error.h"
>
>
> -/*
> - * Subversion developers may want to use some additional debugging facilities
> - * while working on the code. We'll pull that in here, so individual source
> - * files don't have to include this header manually.
> - */
> -#ifdef SVN_DEBUG
> -#include "private/svn_debug.h"
> -#endif
> -
> -
>  #endif /* SVN_TYPES_H */
>
> Modified: trunk/subversion/svn_private_config.hw
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/svn_private_config.hw?pathrev=40510&r1=40509&r2=40510
> ==============================================================================
> --- trunk/subversion/svn_private_config.hw      Sat Nov 14 00:02:24 2009      
 (r40509)
> +++ trunk/subversion/svn_private_config.hw      Sat Nov 14 11:42:26 2009      
 (r40510)
> @@ -91,3 +91,12 @@
>  #define APU_WANT_DB
>  #include <apu_want.h>
>  #endif
> +
> +/*
> + * Subversion developers may want to use some additional debugging facilities
> + * while working on the code. We'll pull that in here, so individual source
> + * files don't have to include this header manually.
> + */
> +#ifdef SVN_DEBUG
> +#include "private/svn_debug.h"
> +#endif

Hi Arfrever,

This change breaks the debug build on Windows since __attribute__ is
not longer defined, see __attribute__no.longer.defined.txt.

I thought that simply adding #include <apr.h> to svn_debug.h would fix
this, but I end up with even more weirdness, see include.apr.h.txt.

I hate to admit I can't quite figure this out.  I've reverted this
change locally so I can build, but please look into this when you can.

Thanks,

Paul

Mime
View raw message