From d8d1017e5ea0b5478a3c571fe12a233c9450d41b Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 21 May 2012 22:27:11 +0200 Subject: [PATCH] Fix warnings in wcschr-c.c MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fixes: In file included from ../sysdeps/i386/i686/multiarch/wcschr-c.c:8:0: ../wcsmbs/wcschr.c:26:1: warning: function declaration isn’t a prototype [-Wstrict-prototypes] ../wcsmbs/wcschr.c:37:1: warning: data definition has no type or storage class [enabled by default] ../wcsmbs/wcschr.c:37:1: warning: type defaults to ‘int’ in declaration of ‘__hidden_ver1’ [enabled by default] ../wcsmbs/wcschr.c:37:1: warning: parameter names (without types) in function declaration [enabled by default] --- ChangeLog | 5 +++++ sysdeps/i386/i686/multiarch/wcschr-c.c | 12 +++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0c25bc3..dbf2fa2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-05-21 Andreas Jaeger + + * sysdeps/i386/i686/multiarch/wcschr-c.c: Redefine libc_hidden_def + only if [SHARED]. Add prototype for __wcschr_ia32. + 2012-05-21 Roland McGrath * sysdeps/x86_64/setjmp.S [PTR_MANGLE] [__ILP32__]: Preserve high bits diff --git a/sysdeps/i386/i686/multiarch/wcschr-c.c b/sysdeps/i386/i686/multiarch/wcschr-c.c index a63e50e..c23af26 100644 --- a/sysdeps/i386/i686/multiarch/wcschr-c.c +++ b/sysdeps/i386/i686/multiarch/wcschr-c.c @@ -1,8 +1,14 @@ +#include + #ifndef NOT_IN_libc -# undef libc_hidden_def -# define libc_hidden_def(name) \ - __hidden_ver1 (__wcschr_ia32, __GI_wcschr, __wcschr_ia32); +# ifdef SHARED +# undef libc_hidden_def +# define libc_hidden_def(name) \ + __hidden_ver1 (__wcschr_ia32, __GI_wcschr, __wcschr_ia32); +# endif # define WCSCHR __wcschr_ia32 #endif +extern __typeof (wcschr) __wcschr_ia32; + #include "wcsmbs/wcschr.c" -- 2.7.4