diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-03-17 21:53:01 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-03-17 21:53:01 +0000 |
| commit | 6ce38a95a4c8318df75cf91fbd90101601b3fa7f (patch) | |
| tree | 044df11ca5f10f967644dffe5b0f621d6ac36188 /string | |
| parent | b428b742cf54d423e5a7a68fcbec9473303eeafa (diff) | |
Updated to fedora-glibc-20070317T2130cvs/fedora-glibc-2_5_90-19
Diffstat (limited to 'string')
| -rw-r--r-- | string/argz.h | 6 | ||||
| -rw-r--r-- | string/bits/string2.h | 4 | ||||
| -rw-r--r-- | string/bits/string3.h | 4 | ||||
| -rw-r--r-- | string/strerror_l.c | 1 |
4 files changed, 8 insertions, 7 deletions
diff --git a/string/argz.h b/string/argz.h index dd7e4706c7..4141d998f9 100644 --- a/string/argz.h +++ b/string/argz.h @@ -1,5 +1,5 @@ /* Routines for dealing with '\0' separated arg vectors. - Copyright (C) 1995,96,97,98,99,2000,2004 Free Software Foundation, Inc. + Copyright (C) 1995,96,97,98,99,2000,2004,2007 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 @@ -160,7 +160,7 @@ extern char *argz_next (__const char *__restrict __argz, size_t __argz_len, __const char *__restrict __entry) __THROW; #ifdef __USE_EXTERN_INLINES -extern inline char * +__extern_inline char * __NTH (__argz_next (__const char *__argz, size_t __argz_len, __const char *__entry)) { @@ -174,7 +174,7 @@ __NTH (__argz_next (__const char *__argz, size_t __argz_len, else return __argz_len > 0 ? (char *) __argz : 0; } -extern inline char * +__extern_inline char * __NTH (argz_next (__const char *__argz, size_t __argz_len, __const char *__entry)) { diff --git a/string/bits/string2.h b/string/bits/string2.h index ba84da2346..1e4d736a17 100644 --- a/string/bits/string2.h +++ b/string/bits/string2.h @@ -1,5 +1,5 @@ /* Machine-independant string function optimizations. - Copyright (C) 1997-2003, 2004 Free Software Foundation, Inc. + Copyright (C) 1997-2003, 2004, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -43,7 +43,7 @@ # ifdef __cplusplus # define __STRING_INLINE inline # else -# define __STRING_INLINE extern __inline +# define __STRING_INLINE __extern_inline # endif #endif diff --git a/string/bits/string3.h b/string/bits/string3.h index 041ac11259..f68ce5899f 100644 --- a/string/bits/string3.h +++ b/string/bits/string3.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2004, 2005 Free Software Foundation, Inc. +/* Copyright (C) 2004, 2005, 2007 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 @@ -151,7 +151,7 @@ extern char *__REDIRECT_NTH (__stpncpy_alias, (char *__dest, __const char *__src, size_t __n), stpncpy); -extern __always_inline char * +__extern_always_inline char * __NTH (stpncpy (char *__dest, __const char *__src, size_t __n)) { if (__bos (__dest) != (size_t) -1 diff --git a/string/strerror_l.c b/string/strerror_l.c index 348a3c50ec..32a004ee75 100644 --- a/string/strerror_l.c +++ b/string/strerror_l.c @@ -19,6 +19,7 @@ #include <libintl.h> #include <locale.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <sys/param.h> |