Sync with gnulib.

diff --git a/lib/mbswidth.h b/lib/mbswidth.h
index 40d4cba0419debe8bd3b802acf05ef59d6388ef8..cd41c9f20efbeb6545db9cdcd025890218b1cc1c 100644 (file)
--- a/lib/mbswidth.h
+++ b/lib/mbswidth.h
@@ -1,5 +1,5 @@
 /* Determine the number of screen columns needed for a string.
 /* Determine the number of screen columns needed for a string.

-   Copyright (C) 2000-2002 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003 Free Software Foundation, Inc.

 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by


@@ -17,6 +17,14 @@
 
 #include <stddef.h>
 
 
 #include <stddef.h>
 

+/* Avoid a clash of our mbswidth() with a function of the same name defined
+   in UnixWare 7.1.1 <wchar.h>.  We need this #include before the #define
+   below.  */
+#if HAVE_WCHAR_H
+# include <wchar.h>
+#endif
+
+

 /* Optional flags to influence mbswidth/mbsnwidth behavior.  */
 
 /* If this bit is set, return -1 upon finding an invalid or incomplete
 /* Optional flags to influence mbswidth/mbsnwidth behavior.  */
 
 /* If this bit is set, return -1 upon finding an invalid or incomplete


@@ -28,6 +36,7 @@
    control characters and 1 otherwise.  */
 #define MBSW_REJECT_UNPRINTABLE        2
 
    control characters and 1 otherwise.  */
 #define MBSW_REJECT_UNPRINTABLE        2
 

+

 /* Returns the number of screen columns needed for STRING.  */
 #define mbswidth gnu_mbswidth  /* avoid clash with UnixWare 7.1.1 function */
 extern int mbswidth (const char *string, int flags);
 /* Returns the number of screen columns needed for STRING.  */
 #define mbswidth gnu_mbswidth  /* avoid clash with UnixWare 7.1.1 function */
 extern int mbswidth (const char *string, int flags);

diff --git a/lib/strnlen.c b/lib/strnlen.c
index b6c710269cd50d9ec6c18d33df3b27ff72b8908c..e7ad6d2f0662ea73720ddd7e2832b4a4499f26e0 100644 (file)
--- a/lib/strnlen.c
+++ b/lib/strnlen.c
@@ -1,5 +1,5 @@
 /* Find the length of STRING, but scan at most MAXLEN characters.
 /* Find the length of STRING, but scan at most MAXLEN characters.

-   Copyright (C) 1996, 1997, 1998, 2000-2002 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 2000-2003 Free Software Foundation, Inc.

    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or


@@ -20,16 +20,13 @@
 #if HAVE_CONFIG_H
 # include <config.h>
 #endif
 #if HAVE_CONFIG_H
 # include <config.h>
 #endif

+#undef strnlen

 
 #if HAVE_STRING_H
 # if !STDC_HEADERS && HAVE_MEMORY_H
 #  include <memory.h>
 # endif
 
 #if HAVE_STRING_H
 # if !STDC_HEADERS && HAVE_MEMORY_H
 #  include <memory.h>
 # endif

-/* Temporarily redefine strnlen so that an inconsistent prototype
-   (on at least AIX4.3.2.0 w/gcc-2.95.3) doesn't cause trouble.  */
-# define strnlen system_strnlen

 # include <string.h>
 # include <string.h>

-# undef strnlen

 #else
 # include <strings.h>
 #endif
 #else
 # include <strings.h>
 #endif


@@ -44,6 +41,10 @@ char *memchr ();
 #undef __strnlen
 #undef strnlen
 
 #undef __strnlen
 #undef strnlen
 

+#ifndef _LIBC
+# define strnlen rpl_strnlen
+#endif
+

 #ifndef weak_alias
 # define __strnlen strnlen
 #endif
 #ifndef weak_alias
 # define __strnlen strnlen
 #endif