GNU C Library master sources branch, master, updated. glibc-2.15-988-gd8d1017

[aj at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  d8d1017e5ea0b5478a3c571fe12a233c9450d41b (commit)
      from  6c7fb1458ddf7943dceac20440226d3d968e518d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=d8d1017e5ea0b5478a3c571fe12a233c9450d41b

commit d8d1017e5ea0b5478a3c571fe12a233c9450d41b
Author: Andreas Jaeger <jaegerandi@gmail.com>
Date:   Mon May 21 22:27:11 2012 +0200

    Fix warnings in wcschr-c.c
    
    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]

diff --git a/ChangeLog b/ChangeLog
index 0c25bc3..dbf2fa2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-21  Andreas Jaeger  <aj@suse.de>
+
+	* sysdeps/i386/i686/multiarch/wcschr-c.c: Redefine libc_hidden_def
+	only if [SHARED]. Add prototype for __wcschr_ia32.
+
 2012-05-21  Roland McGrath  <roland@hack.frob.com>
 
 	* 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 <wchar.h>
+
 #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"

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                              |    5 +++++
 sysdeps/i386/i686/multiarch/wcschr-c.c |   12 +++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources