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

Re: svn trunk r15354: FAIL (win32 ra_local)

From: Kouhei Sutou <kou_at_cozmixng.org>
Date: 2005-07-18 10:24:34 CEST

Hi,

In <20050718080823.47A019BE26@www.cozmixng.org>
  "svn trunk r15354: FAIL (win32 ra_local)" on 07/18/05 03:08:10,
  TOASTER <sussman@collab.net> wrote:

> D:\svnbuild\src-trunk\subversion\libsvn_subr\nls.c(84) : warning C4013: 'apr_conv_ucs2_to_utf8' undefined; assuming extern returning int
> D:\svnbuild\src-trunk\subversion\libsvn_subr\nls.c(93) : warning C4020: 'function through pointer' : too many actual parameters
> D:\svnbuild\src-trunk\subversion\libsvn_subr\nls.c(98) : warning C4013: 'svn_path_internal_style' undefined; assuming extern returning int
> D:\svnbuild\src-trunk\subversion\libsvn_subr\nls.c(98) : warning C4047: '=' : 'const char *' differs in levels of indirection from 'int '
> D:\svnbuild\src-trunk\subversion\libsvn_subr\nls.c(100) : warning C4013: 'svn_path_dirname' undefined; assuming extern returning int
> D:\svnbuild\src-trunk\subversion\libsvn_subr\nls.c(100) : warning C4047: '=' : 'const char *' differs in levels of indirection from 'int '
> D:\svnbuild\src-trunk\subversion\libsvn_subr\nls.c(101) : warning C4013: 'svn_path_join' undefined; assuming extern returning int
> D:\svnbuild\src-trunk\subversion\libsvn_subr\nls.c(103) : warning C4047: '=' : 'const char *' differs in levels of indirection from 'int '

Does the attached path solve those problems? I can't test
the patch because I don't have WIN32 environment. Could
someone test the patch?

[[[
Include necessary header files.

* subversion/libsvn_subr/cmdline.c: Move
  '#include "arch/win32/apr_arch_utf8.h"' to
  subversion/libsvn_subr/nls.c.

* subversion/libsvn_subr/nls.c: Include svn_path.h and
  arch/win32/apr_arch_utf8.h.
]]]

Thanks,

--
kou

Index: subversion/libsvn_subr/cmdline.c
===================================================================
--- subversion/libsvn_subr/cmdline.c (revision 15343)
+++ subversion/libsvn_subr/cmdline.c (working copy)
@@ -40,14 +40,6 @@
 
 #include "svn_private_config.h"
 
-#ifdef WIN32
-/* 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
-
 #define SVN_UTF_CONTOU_XLATE_HANDLE "svn-utf-contou-xlate-handle"
 #define SVN_UTF_UTOCON_XLATE_HANDLE "svn-utf-utocon-xlate-handle"
 
Index: subversion/libsvn_subr/nls.c
===================================================================
--- subversion/libsvn_subr/nls.c (revision 15343)
+++ subversion/libsvn_subr/nls.c (working copy)
@@ -29,10 +29,19 @@
 
 #include "svn_error.h"
 #include "svn_pools.h"
+#include "svn_path.h"
 
 #include "svn_private_config.h"
 
+#ifdef WIN32
+/* 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
 
+
 svn_error_t *
 svn_nls_environment_init (void)
 {

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jul 18 10:25:48 2005

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