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

This fixes BZ #10159.  The stdlib.h definition was out of date.
(cherry picked from commit a64039b084ae3faca3336b7d95f2e40c497d20e1)

diff --git a/ChangeLog b/ChangeLog
index eceae0be382eed30e4344786d16cd8a59d3d67cb..772438de460b8a6c7feb6a099d3488db1220d514 100644 (file)
--- 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 77bb8604546db0e610ed10e3d274693ba5117850..5b084efa3eba0da1bf3688ecceeedfcf7cd0d29a 100644 (file)
--- 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