r1081 - in trunk/glibc-2.3-head/sysdeps/kfreebsd: . bits
Author: ps-guest
Date: 2006-01-20 10:24:16 +0000 (Fri, 20 Jan 2006)
New Revision: 1081
Modified:
trunk/glibc-2.3-head/sysdeps/kfreebsd/bits/waitflags.h
trunk/glibc-2.3-head/sysdeps/kfreebsd/wait3.c
Log:
* define WCONTINUED, WSTOPPED
* reuse linux version of wait3.c (which is bsd4.4 version for now)
Modified: trunk/glibc-2.3-head/sysdeps/kfreebsd/bits/waitflags.h
===================================================================
--- trunk/glibc-2.3-head/sysdeps/kfreebsd/bits/waitflags.h 2006-01-20 10:16:42 UTC (rev 1080)
+++ trunk/glibc-2.3-head/sysdeps/kfreebsd/bits/waitflags.h 2006-01-20 10:24:16 UTC (rev 1081)
@@ -26,6 +26,10 @@
#define WNOHANG 1 /* Don't block waiting. */
#define WUNTRACED 2 /* Report status of stopped children. */
+/* Bits in the fourth argument to `waitid'. */
+#define WSTOPPED 2 /* Report stopped child (same as WUNTRACED). */
+#define WCONTINUED 4 /* Report continued child. */
+
#define __WCLONE 0x80000000 /* Wait for cloned process. */
#ifdef __USE_BSD
# define WLINUXCLONE __WCLONE /* FreeBSD name for __WCLONE. */
Modified: trunk/glibc-2.3-head/sysdeps/kfreebsd/wait3.c
===================================================================
--- trunk/glibc-2.3-head/sysdeps/kfreebsd/wait3.c 2006-01-20 10:16:42 UTC (rev 1080)
+++ trunk/glibc-2.3-head/sysdeps/kfreebsd/wait3.c 2006-01-20 10:24:16 UTC (rev 1081)
@@ -1,38 +1 @@
-/* Copyright (C) 1991, 1992, 1993, 1995, 1997 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
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-#include <errno.h>
-#include <sys/wait.h>
-#include <sys/types.h>
-#include <sysdep-cancel.h>
-
-/* Wait for a child to exit. When one does, put its status in *STAT_LOC and
- return its process ID. For errors return (pid_t) -1. If USAGE is not nil,
- store information about the child's resource usage (as a `struct rusage')
- there. If the WUNTRACED bit is set in OPTIONS, return status for stopped
- children; otherwise don't. */
-pid_t
-__wait3 (stat_loc, options, usage)
- __WAIT_STATUS stat_loc;
- int options;
- struct rusage *usage;
-{
- return __wait4(WAIT_ANY, stat_loc, options, usage);
-}
-
-weak_alias (__wait3, wait3)
+#include <sysdeps/unix/sysv/linux/wait3.c>
Reply to: