summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/sys/ioccom.h12
-rw-r--r--sys/sys/ioctl.h10
2 files changed, 12 insertions, 10 deletions
diff --git a/sys/sys/ioccom.h b/sys/sys/ioccom.h
index e2c54a54..3a8b1c4 100644
--- a/sys/sys/ioccom.h
+++ b/sys/sys/ioccom.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ioccom.h 8.2 (Berkeley) 3/28/94
- * $Id: ioccom.h,v 1.2 1994/08/02 07:53:03 davidg Exp $
+ * $Id: ioccom.h,v 1.3 1996/05/02 14:20:59 phk Exp $
*/
#ifndef _SYS_IOCCOM_H_
@@ -62,4 +62,14 @@
/* this should be _IORW, but stdio got there first */
#define _IOWR(g,n,t) _IOC(IOC_INOUT, (g), (n), sizeof(t))
+#ifndef KERNEL
+
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+int ioctl __P((int, unsigned long, ...));
+__END_DECLS
+
+#endif /* !KERNEL */
+
#endif /* !_SYS_IOCCOM_H_ */
diff --git a/sys/sys/ioctl.h b/sys/sys/ioctl.h
index a8afb31..9e73b92 100644
--- a/sys/sys/ioctl.h
+++ b/sys/sys/ioctl.h
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)ioctl.h 8.6 (Berkeley) 3/28/94
- * $Id: ioctl.h,v 1.2 1994/08/02 07:53:04 davidg Exp $
+ * $Id: ioctl.h,v 1.3 1996/01/30 23:00:43 mpp Exp $
*/
#ifndef _SYS_IOCTL_H_
@@ -63,14 +63,6 @@ struct ttysize {
#include <sys/filio.h>
#include <sys/sockio.h>
-#ifndef KERNEL
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int ioctl __P((int, unsigned long, ...));
-__END_DECLS
-#endif /* !KERNEL */
#endif /* !_SYS_IOCTL_H_ */
/*
OpenPOWER on IntegriCloud