Garrett Rooney wrote:
> On 9/15/06, Lieven Govaerts <svnlgo@mobsol.be> wrote:
>
>> Apparently these internal apr headers were included there for a reason.
>> Maybe someone else on the list has suggestions for other ways to get
>> those headers removed.
There's been recent discussion on the vss2svn list that may be relevant:
http://www.mail-archive.com/vss2svn-users@lists.pumacode.org/msg00475.html.
> Perhaps if they're not needed for MinGW builds we could just avoid
> including them when compiling under MinGW. A little ifdef magic
> should do the trick...
I'm curious why MinGW doesn't need them if VC++ does? Regardless, I've
attached a patch with an ifdef.
-Matthias Miller
[[[
* subversion/libsvn_subr/nls.c: MinGW doesn't need internal APR headers
* subversion/libsvn_subr/config_win.c: MinGW doesn't need internal APR
headers
]]]
Index: subversion/libsvn_subr/nls.c
===================================================================
--- subversion/libsvn_subr/nls.c (revision 21508)
+++ subversion/libsvn_subr/nls.c (working copy)
@@ -34,7 +34,7 @@
#include "svn_private_config.h"
-#ifdef WIN32
+#if defined(WIN32) && !defined(__MINGW32__)
/* FIXME: We're using an internal APR header here, which means we
have to build Subversion with APR sources. This being Win32-only,
that should be fine for now, but a better solution must be found in
Index: subversion/libsvn_subr/config_win.c
===================================================================
--- subversion/libsvn_subr/config_win.c (revision 21508)
+++ subversion/libsvn_subr/config_win.c (working copy)
@@ -27,11 +27,13 @@
#include <shlobj.h>
#include <apr_file_info.h>
+#ifndef __MINGW32__
/* FIXME: We're using an internal APR header here, which means we
have to build Subversion with APR sources. This being Win32-only,
that should be fine for now, but a better solution must be found in
combination with issue #850. */
#include <arch/win32/apr_arch_utf8.h>
+#endif
#include "svn_error.h"
#include "svn_path.h"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Sep 15 21:54:51 2006