From: Ulrich Drepper <drepper@redhat.com>
Date: Sat, 16 May 2009 18:39:39 +0000 (-0700)
Subject: Unify __WAIT_INT definition in stdlib.h and sys/wait.h.
X-Git-Tag: fedora/glibc-2.10.90-1~8^2~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a64039b084ae3faca3336b7d95f2e40c497d20e1;p=thirdparty%2Fglibc.git

Unify __WAIT_INT definition in stdlib.h and sys/wait.h.

This fixes BZ #10159.  The stdlib.h definition was out of date.
---

diff --git a/ChangeLog b/ChangeLog
index 8d94a78b8c9..d8a8305c820 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-05-16  Ulrich Drepper  <drepper@redhat.com>
 
+	[BZ #10159]
+	* stdlib/stdlib.h (__WAIT_INT): Match the definition in <sys/wait.h>.
+
 	* nscd/nscd_helper.c (__nscd_cache_search): Fix exit condition in last
 	patch.
 
diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
index 77bb8604546..5b084efa3eb 100644
--- a/stdlib/stdlib.h
+++ b/stdlib/stdlib.h
@@ -48,9 +48,9 @@ __BEGIN_DECLS
    as well as POSIX.1 use of `int' for the status word.  */
 
 #  if defined __GNUC__ && !defined __cplusplus
-#   define __WAIT_INT(status)						      \
-  (__extension__ ({ union { __typeof(status) __in; int __i; } __u;	      \
-		    __u.__in = (status); __u.__i; }))
+#   define __WAIT_INT(status) \
+  (__extension__ (((union { __typeof(status) __in; int __i; }) \
+                   { .__in = (status) }).__i))
 #  else
 #   define __WAIT_INT(status)	(*(int *) &(status))
 #  endif