Page MenuHomeFreeBSD
Files F115630649

D44385.diff
No OneTemporary
Actions

D44385.diff
View Options

diff --git a/lib/libsys/_libsys.h b/lib/libsys/_libsys.h
--- a/lib/libsys/_libsys.h
+++ b/lib/libsys/_libsys.h
@@ -11,11 +11,11 @@
#include <sys/_cpuset.h>
#include <sys/_domainset.h>
#include <sys/_ffcounter.h>
+#include <sys/_idtype.h>
#include <sys/_semaphore.h>
#include <sys/_sigaltstack.h>
#include <machine/ucontext.h> /* for mcontext_t */
#include <sys/_ucontext.h>
-#include <sys/wait.h>
struct __siginfo;
struct __ucontext;
diff --git a/sys/sys/_idtype.h b/sys/sys/_idtype.h
new file mode 100644
--- /dev/null
+++ b/sys/sys/_idtype.h
@@ -0,0 +1,77 @@
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright (c) 1982, 1986, 1989, 1993, 1994
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _SYS__IDTYPE_H_
+#define _SYS__IDTYPE_H_
+
+#include <sys/cdefs.h>
+
+#ifndef _IDTYPE_T_DECLARED
+#define _IDTYPE_T_DECLARED
+typedef enum
+#if __BSD_VISIBLE
+ idtype /* pollutes XPG4.2 namespace */
+#endif
+ {
+ /*
+ * These names were mostly lifted from Solaris source code and
+ * still use Solaris style naming to avoid breaking any
+ * OpenSolaris code which has been ported to FreeBSD. There
+ * is no clear FreeBSD counterpart for all of the names, but
+ * some have a clear correspondence to FreeBSD entities.
+ *
+ * The numerical values are kept synchronized with the Solaris
+ * values.
+ */
+ P_PID, /* A process identifier. */
+ P_PPID, /* A parent process identifier. */
+ P_PGID, /* A process group identifier. */
+ P_SID, /* A session identifier. */
+ P_CID, /* A scheduling class identifier. */
+ P_UID, /* A user identifier. */
+ P_GID, /* A group identifier. */
+ P_ALL, /* All processes. */
+ P_LWPID, /* An LWP identifier. */
+ P_TASKID, /* A task identifier. */
+ P_PROJID, /* A project identifier. */
+ P_POOLID, /* A pool identifier. */
+ P_JAILID, /* A zone identifier. */
+ P_CTID, /* A (process) contract identifier. */
+ P_CPUID, /* CPU identifier. */
+ P_PSETID /* Processor set identifier. */
+} idtype_t; /* The type of id_t we are using. */
+
+#if __BSD_VISIBLE
+#define P_ZONEID P_JAILID
+#endif
+#endif /* !_IDTYPE_T_DECLARED */
+
+#endif /* !_SYS__IDTYPE_H_ */
diff --git a/sys/sys/wait.h b/sys/sys/wait.h
--- a/sys/sys/wait.h
+++ b/sys/sys/wait.h
@@ -33,6 +33,7 @@
#define _SYS_WAIT_H_
#include <sys/cdefs.h>
+#include <sys/_idtype.h>
/*
* This file holds definitions relevant to the wait4 system call and the
@@ -87,46 +88,6 @@
#define WLINUXCLONE 0x80000000 /* Wait for kthread spawned from linux_clone. */
#endif
-#ifndef _IDTYPE_T_DECLARED
-typedef enum
-#if __BSD_VISIBLE
- idtype /* pollutes XPG4.2 namespace */
-#endif
- {
- /*
- * These names were mostly lifted from Solaris source code and
- * still use Solaris style naming to avoid breaking any
- * OpenSolaris code which has been ported to FreeBSD. There
- * is no clear FreeBSD counterpart for all of the names, but
- * some have a clear correspondence to FreeBSD entities.
- *
- * The numerical values are kept synchronized with the Solaris
- * values.
- */
- P_PID, /* A process identifier. */
- P_PPID, /* A parent process identifier. */
- P_PGID, /* A process group identifier. */
- P_SID, /* A session identifier. */
- P_CID, /* A scheduling class identifier. */
- P_UID, /* A user identifier. */
- P_GID, /* A group identifier. */
- P_ALL, /* All processes. */
- P_LWPID, /* An LWP identifier. */
- P_TASKID, /* A task identifier. */
- P_PROJID, /* A project identifier. */
- P_POOLID, /* A pool identifier. */
- P_JAILID, /* A zone identifier. */
- P_CTID, /* A (process) contract identifier. */
- P_CPUID, /* CPU identifier. */
- P_PSETID /* Processor set identifier. */
-} idtype_t; /* The type of id_t we are using. */
-
-#if __BSD_VISIBLE
-#define P_ZONEID P_JAILID
-#endif
-#define _IDTYPE_T_DECLARED
-#endif
-
/*
* Tokens for special values of the "pid" parameter to wait4.
* Extended struct __wrusage to collect rusage for both the target
diff --git a/sys/tools/makesyscalls.lua b/sys/tools/makesyscalls.lua
--- a/sys/tools/makesyscalls.lua
+++ b/sys/tools/makesyscalls.lua
@@ -1577,11 +1577,11 @@
#include <sys/_cpuset.h>
#include <sys/_domainset.h>
#include <sys/_ffcounter.h>
+#include <sys/_idtype.h>
#include <sys/_semaphore.h>
#include <sys/_sigaltstack.h>
#include <machine/ucontext.h> /* for mcontext_t */
#include <sys/_ucontext.h>
-#include <sys/wait.h>
]], generated_tag))

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 27, 6:38 AM (15 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17814432
Default Alt Text
D44385.diff (5 KB)

Event Timeline