about summary refs log tree commit diff
path: root/sysdeps/unix
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-06-16 19:39:00 +0000
committerUlrich Drepper <drepper@redhat.com>2003-06-16 19:39:00 +0000
commit0e0deb03602992472f6efd0e442f6eb0488a1368 (patch)
tree9748c6657422fc7702c49986f3e258a29803b1dc /sysdeps/unix
parent2f7f7bc65803510cdf137bde00fdb72c918af63c (diff)
downloadglibc-0e0deb03602992472f6efd0e442f6eb0488a1368.tar.gz
glibc-0e0deb03602992472f6efd0e442f6eb0488a1368.tar.xz
glibc-0e0deb03602992472f6efd0e442f6eb0488a1368.zip
Update.
	* Makefile: Add CFLAGS definition to compile function wrappers
	duplicated from libc with exceptions.
	* tst-cancel4.c: Also check cancellation handlers.
Diffstat (limited to 'sysdeps/unix')
-rw-r--r--sysdeps/unix/sysv/linux/wait.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/wait.c b/sysdeps/unix/sysv/linux/wait.c
index 3e39ad4bf1..39d1066ddd 100644
--- a/sysdeps/unix/sysv/linux/wait.c
+++ b/sysdeps/unix/sysv/linux/wait.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1995,1996,1997,2002,2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -24,7 +24,7 @@
 
 /* Wait for a child to die.  When one does, put its status in *STAT_LOC
    and return its process ID.  For errors, return (pid_t) -1.  */
-__pid_t
+pid_t
 __libc_wait (__WAIT_STATUS_DEFN stat_loc)
 {
   if (SINGLE_THREAD_P)
@@ -33,8 +33,8 @@ __libc_wait (__WAIT_STATUS_DEFN stat_loc)
 
   int oldtype = LIBC_CANCEL_ASYNC ();
 
-  int result = INLINE_SYSCALL (wait4, 4, WAIT_ANY, stat_loc, 0,
-			       (struct rusage *) NULL);
+  pid_t result = INLINE_SYSCALL (wait4, 4, WAIT_ANY, stat_loc, 0,
+				 (struct rusage *) NULL);
 
   LIBC_CANCEL_RESET (oldtype);