You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by rh...@apache.org on 2014/03/05 18:02:59 UTC

svn commit: r1574573 - /subversion/trunk/subversion/libsvn_subr/utf8proc.c

Author: rhuijben
Date: Wed Mar  5 17:02:59 2014
New Revision: 1574573

URL: http://svn.apache.org/r1574573
Log:
* subversion/libsvn_subr/utf8proc.c
  Following up on r1573069, resolve a shadowed symbol warning by redefining
  strlen when including "utf8proc/utf8proc.c".

Modified:
    subversion/trunk/subversion/libsvn_subr/utf8proc.c

Modified: subversion/trunk/subversion/libsvn_subr/utf8proc.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/utf8proc.c?rev=1574573&r1=1574572&r2=1574573&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/utf8proc.c (original)
+++ subversion/trunk/subversion/libsvn_subr/utf8proc.c Wed Mar  5 17:02:59 2014
@@ -31,7 +31,11 @@
 #define UNUSED(x) ((void)(x))
 
 #define UTF8PROC_INLINE
+/* Somehow utf8proc thinks it is nice to use strlen as an argument name,
+   while this function is already defined via apr.h */
+#define strlen svn__strlen_var
 #include "utf8proc/utf8proc.c"
+#undef strlen
 
 
 const char *svn_utf__utf8proc_version(void)