aboutsummaryrefslogtreecommitdiff
path: root/string/bits/string2.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-11-08 21:20:06 +0000
committerUlrich Drepper <drepper@redhat.com>2000-11-08 21:20:06 +0000
commitd3d99893eeedbb681f6b9b76427c33129d69834d (patch)
tree104144f66e8fba0b8b8d1fd958b9df8bd2236c56 /string/bits/string2.h
parenta1e88b9a2fe01ed6bb3ba749af7d98e89bb14d3f (diff)
downloadglibc-d3d99893eeedbb681f6b9b76427c33129d69834d.tar
glibc-d3d99893eeedbb681f6b9b76427c33129d69834d.tar.gz
glibc-d3d99893eeedbb681f6b9b76427c33129d69834d.tar.bz2
glibc-d3d99893eeedbb681f6b9b76427c33129d69834d.zip
Update.
* catgets/gencat.c (main): Don't use exit() to avoid warnings with broken compilers. * include/features.h (__STDC_ISO_10646__): Correct value to be 200009L. Patch by Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk>. 2000-11-08 H.J. Lu <hjl@gnu.org> * pwd/Versions (GLIBC_2.1.2): Add getpwnam_r. 2000-11-08 Jakub Jelinek <jakub@redhat.com> * string/bits/string2.h: Check if _USE_STRING_ARCH_ macros are defined, not _HAVE_STRING_ARCH_. * sysdeps/i386/bits/string.h (_USE_STRING_ARCH_memset, _USE_STRING_ARCH_strchr): Define. * sysdeps/i386/i486/bits/string.h (_USE_STRING_ARCH_memset, _USE_STRING_ARCH_strchr): Define. * sysdeps/sparc/bits/string.h: New file. 2000-11-08 Bruno Haible <haible@clisp.cons.org> * locale/C-translit.h.in: Tweak <U2014> result. * locale/C-translit.h: Regenerated. 2000-11-08 Ulrich Drepper <drepper@redhat.com> * posix/unistd.h: Add attribute((const)) to sysconf prototype.
Diffstat (limited to 'string/bits/string2.h')
-rw-r--r--string/bits/string2.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/string/bits/string2.h b/string/bits/string2.h
index a85add72b1..2cff87be12 100644
--- a/string/bits/string2.h
+++ b/string/bits/string2.h
@@ -698,7 +698,7 @@ __stpcpy_small (char *__dest,
/* Copy no more than N characters of SRC to DEST. */
#ifndef _HAVE_STRING_ARCH_strncpy
-# if defined _HAVE_STRING_ARCH_memset && defined _HAVE_STRING_ARCH_mempcpy
+# if defined _USE_STRING_ARCH_memset && defined _USE_STRING_ARCH_mempcpy
# define strncpy(dest, src, n) \
(__extension__ ({ char *__dest = (dest); \
__builtin_constant_p (src) && __builtin_constant_p (n) \
@@ -721,7 +721,7 @@ __stpcpy_small (char *__dest,
/* Append no more than N characters from SRC onto DEST. */
#ifndef _HAVE_STRING_ARCH_strncat
-# ifdef _HAVE_STRING_ARCH_strchr
+# ifdef _USE_STRING_ARCH_strchr
# define strncat(dest, src, n) \
(__extension__ ({ char *__dest = (dest); \
__builtin_constant_p (src) && __builtin_constant_p (n) \