* string/strcasestr.c (CMP_FUNC): Use __strncasecmp, not strncasecmp.

diff --git a/ChangeLog b/ChangeLog
index 01dd75a433a7040b7574964ca4dfc5c40d7673e6..110f60889cdb33debb011a28293df885bceaca4a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2008-05-16  Ulrich Drepper  <drepper@redhat.com>
 
+       * string/strcasestr.c (CMP_FUNC): Use __strncasecmp, not strncasecmp.
+
        * sysdeps/posix/getaddrinfo.c (gaih_inet): After gethostbyname4_r
        lookup, don't assign canon unconditionally.
 

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 93fc456e778321ae7786a9ca2510fce6bfce1f64..878b10cce25a5c424c07f26943ae0bd1816f49e6 100644 (file)
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-16  Ulrich Drepper  <drepper@redhat.com>
+
+       * locales/iso14651_t1_common: Remove duplicate U0C7B definition.
+
 2008-05-14  Ulrich Drepper  <drepper@redhat.com>
 
        [BZ #6438]

diff --git a/localedata/locales/iso14651_t1_common b/localedata/locales/iso14651_t1_common
index ca3a8144cb52c1317c26f7620211faaaf7bad041..e9721fd078bc7d9c4c6a3f72189a96b46f3a8fa6 100644 (file)
--- a/localedata/locales/iso14651_t1_common
+++ b/localedata/locales/iso14651_t1_common
@@ -3416,7 +3416,8 @@ order_start <TELUGU>;forward;forward;forward;forward,position
 <U0C15> <t-ka>;<BAS>;<MIN>;IGNORE
 <U0C16> <t-kha>;<BAS>;<MIN>;IGNORE
 <U0C17> <t-ga>;<BAS>;<MIN>;IGNORE
-<U0C7B> <t-gga>;<BAS>;<MIN>;IGNORE
+#XXX This is wrong since there is already a definition for U0C7B.
+#<U0C7B> <t-gga>;<BAS>;<MIN>;IGNORE
 <U0C18> <t-gha>;<BAS>;<MIN>;IGNORE
 <U0C19> <t-nga>;<BAS>;<MIN>;IGNORE
 <U0C1A> <t-ca>;<BAS>;<MIN>;IGNORE

diff --git a/string/strcasestr.c b/string/strcasestr.c
index 9de19aafa8b02b70a94c771783acd1a4a93ab88a..92f2eac7c8365e08de941de43e16b0195bafc9ab 100644 (file)
--- a/string/strcasestr.c
+++ b/string/strcasestr.c
@@ -46,7 +46,7 @@
    && ((h_l) = (j) + (n_l)))
 #define CANON_ELEMENT(c) TOLOWER (c)
 #define CMP_FUNC(p1, p2, l)                            \
-  strncasecmp ((const char *) (p1), (const char *) (p2), l)
+  __strncasecmp ((const char *) (p1), (const char *) (p2), l)
 #include "str-two-way.h"
 
 #undef strcasestr