Ticket #2234: glib2-wcslen-darwin6.patch

glib/gnulib/vasnprintf.c

@@ -41 +41 @@
 #include <float.h>      /* DBL_MAX_EXP, LDBL_MAX_EXP */
 #include "printf-parse.h"
 
+#ifdef HAVE_WCHAR_T
+# ifdef HAVE_WCSLEN
+#  define local_wcslen wcslen
+# else
+   /* Solaris 2.5.1 has wcslen() in a separate library libw.so. To avoid
+      a dependency towards this library, here is a local substitute.
+      Define this substitute only once, even if this file is included
+      twice in the same compilation unit.  */
+#  ifndef local_wcslen_defined
+#   define local_wcslen_defined 1
+static size_t
+local_wcslen (const wchar_t *s)
+{
+  const wchar_t *ptr;
+
+  for (ptr = s; *ptr != (wchar_t) 0; ptr++)
+    ;
+  return ptr - s;
+}
+#  endif
+# endif
+#endif
+
 /* For those losing systems which don't have 'alloca' we have to add
    some additional code emulating it.  */ 
 #ifdef HAVE_ALLOCA 
@@ -539 +562 @@
 # ifdef HAVE_WCHAR_T
                       if (type == TYPE_WIDE_STRING)
                         tmp_length =
-                          wcslen (a.arg[dp->arg_index].a.a_wide_string)
+                          local_wcslen (a.arg[dp->arg_index].a.a_wide_string)
                           * MB_CUR_MAX;
                       else
 # endif