about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2016-09-02 16:57:59 -0700
committerRoland McGrath <roland@hack.frob.com>2016-09-02 16:59:49 -0700
commitd289049cf550b975487f94dfbd7af9d5a50b2233 (patch)
tree988519c3c1efdaa424db577e72f57b90c64bf796
parent537067248021228861ec88bb1feb8922e9818701 (diff)
downloadglibc-d289049cf550b975487f94dfbd7af9d5a50b2233.tar.gz
glibc-d289049cf550b975487f94dfbd7af9d5a50b2233.tar.xz
glibc-d289049cf550b975487f94dfbd7af9d5a50b2233.zip
Fix generic wait3 after union wait_status removal.
	* sysdeps/posix/wait3.c: Don't treat STAT_LOC as a union, since it's
	not any more.

(cherry picked from commit 9a3d16ac152447567bfc822497c564a0630c79fe)
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/posix/wait3.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0127244609..2738295ab1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2016-09-02  Roland McGrath  <roland@hack.frob.com>
 
+	* sysdeps/posix/wait3.c: Don't treat STAT_LOC as a union, since it's
+	not any more.
+
+2016-09-02  Roland McGrath  <roland@hack.frob.com>
+
 	* sysdeps/nacl/clock.c (clock): nacl_abi_clock_t -> nacl_irt_clock_t
 
 2016-08-17  Florian Weimer  <fweimer@redhat.com>
diff --git a/sysdeps/posix/wait3.c b/sysdeps/posix/wait3.c
index cf43d973a7..73722d2be6 100644
--- a/sysdeps/posix/wait3.c
+++ b/sysdeps/posix/wait3.c
@@ -33,7 +33,7 @@ __wait3 (int *stat_loc, int options, struct rusage *usage)
       __set_errno (ENOSYS);
       return (pid_t) -1;
     }
-  return __waitpid (WAIT_ANY, stat_loc.__iptr, options);
+  return __waitpid (WAIT_ANY, stat_loc, options);
 }
 
 weak_alias (__wait3, wait3)