diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2009-05-16 11:39:39 -0700 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2009-05-16 11:39:39 -0700 |
| commit | a64039b084ae3faca3336b7d95f2e40c497d20e1 (patch) | |
| tree | b28690cbd8d7ed88382b3a19e75cef504b04cabc | |
| parent | fa546abe9d0346d5d87b8fe19884993408476d77 (diff) | |
| download | glibc-a64039b084ae3faca3336b7d95f2e40c497d20e1.tar.gz glibc-a64039b084ae3faca3336b7d95f2e40c497d20e1.tar.xz glibc-a64039b084ae3faca3336b7d95f2e40c497d20e1.zip | |
Unify __WAIT_INT definition in stdlib.h and sys/wait.h.
This fixes BZ #10159. The stdlib.h definition was out of date.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | stdlib/stdlib.h | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 8d94a78b8c..d8a8305c82 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 77bb860454..5b084efa3e 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 |