diff options
| author | Andreas Schwab <schwab@redhat.com> | 2011-10-28 11:45:12 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2011-10-28 12:02:08 +0200 |
| commit | 0c92d8a87a47ab3276b4591bd084001053c5af2d (patch) | |
| tree | 5c1b5f35861e5eabddb6f4aa9a04cd73041b2ec8 | |
| parent | b43433460ba8c8265974aa929788e15077394f0d (diff) | |
| download | glibc-0c92d8a87a47ab3276b4591bd084001053c5af2d.tar.gz glibc-0c92d8a87a47ab3276b4591bd084001053c5af2d.tar.xz glibc-0c92d8a87a47ab3276b4591bd084001053c5af2d.zip | |
Fix some warning nits
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | sysdeps/i386/i686/multiarch/strnlen-c.c | 6 | ||||
| -rw-r--r-- | sysdeps/i386/i686/multiarch/wcscmp-c.c | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index ec76080976..943ff2db41 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-10-28 Andreas Schwab <schwab@redhat.com> + * sysdeps/i386/i686/multiarch/strnlen-c.c (libc_hidden_def): Only + redefine if SHARED. + * sysdeps/i386/i686/multiarch/wcscmp-c.c (libc_hidden_def): Likewise. + * sysdeps/i386/i686/multiarch/Makefile (sysdep_routines): Move wide char related routines to wcsmbs subdir. diff --git a/sysdeps/i386/i686/multiarch/strnlen-c.c b/sysdeps/i386/i686/multiarch/strnlen-c.c index 567af2c815..f02465d6a4 100644 --- a/sysdeps/i386/i686/multiarch/strnlen-c.c +++ b/sysdeps/i386/i686/multiarch/strnlen-c.c @@ -1,6 +1,6 @@ -#ifndef NOT_IN_libc -# define STRNLEN __strnlen_ia32 -# undef libc_hidden_builtin_def +#define STRNLEN __strnlen_ia32 +#ifdef SHARED +# undef libc_hidden_def # define libc_hidden_def(name) \ __hidden_ver1 (__strnlen_ia32, __GI_strnlen, __strnlen_ia32); #endif diff --git a/sysdeps/i386/i686/multiarch/wcscmp-c.c b/sysdeps/i386/i686/multiarch/wcscmp-c.c index 9592455d0d..53cc4e9c64 100644 --- a/sysdeps/i386/i686/multiarch/wcscmp-c.c +++ b/sysdeps/i386/i686/multiarch/wcscmp-c.c @@ -1,7 +1,5 @@ -#ifndef NOT_IN_libc - -# define WCSCMP __wcscmp_ia32 - +#define WCSCMP __wcscmp_ia32 +#ifdef SHARED # undef libc_hidden_def # define libc_hidden_def(name) \ __hidden_ver1 (__wcscmp_ia32, __GI_wcscmp, __wcscmp_ia32); |