diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2014-11-23 04:31:43 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2014-11-23 04:31:43 +0000 |
| commit | 4c314f3886683365d71d1e45e67b010dea998fa9 (patch) | |
| tree | 6bba0e25530f885ec9fd328ed1a5204357bf565d /sys | |
| parent | 2fdfb5dab29b9ca308fa90f8ee19ae5df27c64d5 (diff) | |
We now get <sys/cdefs.h> via <sys/ipc.h>
Only pull <sys/queue.h> into the kernel namespacem
ok deraadt@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/sys/msg.h | 7 | ||||
| -rw-r--r-- | sys/sys/sem.h | 6 | ||||
| -rw-r--r-- | sys/sys/shm.h | 3 |
3 files changed, 7 insertions, 9 deletions
diff --git a/sys/sys/msg.h b/sys/sys/msg.h index 463319ce5a8..96a4a0cb689 100644 --- a/sys/sys/msg.h +++ b/sys/sys/msg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: msg.h,v 1.18 2012/02/05 18:30:32 guenther Exp $ */ +/* $OpenBSD: msg.h,v 1.19 2014/11/23 04:31:42 guenther Exp $ */ /* $NetBSD: msg.h,v 1.9 1996/02/09 18:25:18 christos Exp $ */ /* @@ -24,7 +24,6 @@ #define _SYS_MSG_H_ #include <sys/ipc.h> -#include <sys/queue.h> /* * The MSG_NOERROR identifier value, the msqid_ds struct and the msg struct @@ -52,6 +51,8 @@ struct msqid_ds { }; #ifdef _KERNEL +#include <sys/queue.h> + struct msg { long msg_type; size_t msg_len; @@ -158,8 +159,6 @@ struct msg_sysctl_info { #ifndef _KERNEL -#include <sys/cdefs.h> - __BEGIN_DECLS int msgctl(int, int, struct msqid_ds *); int msgget(key_t, int); diff --git a/sys/sys/sem.h b/sys/sys/sem.h index bbf509e0f05..a60bf070280 100644 --- a/sys/sys/sem.h +++ b/sys/sys/sem.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sem.h,v 1.22 2014/07/10 14:16:49 deraadt Exp $ */ +/* $OpenBSD: sem.h,v 1.23 2014/11/23 04:31:42 guenther Exp $ */ /* $NetBSD: sem.h,v 1.8 1996/02/09 18:25:29 christos Exp $ */ /* @@ -10,11 +10,9 @@ #ifndef _SYS_SEM_H_ #define _SYS_SEM_H_ -#include <sys/cdefs.h> #ifndef _SYS_IPC_H_ #include <sys/ipc.h> #endif -#include <sys/queue.h> #if __BSD_VISIBLE @@ -104,6 +102,8 @@ union semun { #ifdef _KERNEL +#include <sys/queue.h> + /* * Kernel implementation stuff */ diff --git a/sys/sys/shm.h b/sys/sys/shm.h index d49263bf5b1..551eb74156c 100644 --- a/sys/sys/shm.h +++ b/sys/sys/shm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: shm.h,v 1.26 2014/10/09 04:04:27 tedu Exp $ */ +/* $OpenBSD: shm.h,v 1.27 2014/11/23 04:31:42 guenther Exp $ */ /* $NetBSD: shm.h,v 1.20 1996/04/09 20:55:35 cgd Exp $ */ /* @@ -39,7 +39,6 @@ #ifndef _SYS_SHM_H_ #define _SYS_SHM_H_ -#include <sys/cdefs.h> #ifndef _SYS_IPC_H_ #include <sys/ipc.h> #endif |