summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorEd Schouten <ed@FreeBSD.org>2009-05-09 19:01:24 +0000
committerEd Schouten <ed@FreeBSD.org>2009-05-09 19:01:24 +0000
commitda7e5864c601fa0c235cd15ed5144d65f5e5ffe7 (patch)
tree60c156aaabb225266932f47c62a7662224e7e190 /sys
parente678f09a1504fdbf556dd96aba9835ca4194b040 (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/sys/ioctl.h24
1 files changed, 2 insertions, 22 deletions
diff --git a/sys/sys/ioctl.h b/sys/sys/ioctl.h
index 670240928ccc..07d941481267 100644
--- a/sys/sys/ioctl.h
+++ b/sys/sys/ioctl.h
@@ -39,33 +39,13 @@
#define _SYS_IOCTL_H_
#ifdef _KERNEL
-#ifndef _SYS_CDEFS_H_
-#error this file needs sys/cdefs.h as a prerequisite
-#endif
-#ifdef __CC_SUPPORTS_WARNING
-#warning "Don't #include ioctl.h in the kernel. Include xxxio.h instead."
-#endif
+#error "Don't #include ioctl.h in the kernel. Include xxxio.h instead."
#endif /* _KERNEL */
-#include <sys/ttycom.h>
-
-/*
- * Pun for SunOS prior to 3.2. SunOS 3.2 and later support TIOCGWINSZ
- * and TIOCSWINSZ (yes, even 3.2-3.5, the fact that it wasn't documented
- * notwithstanding).
- */
-struct ttysize {
- unsigned short ts_lines;
- unsigned short ts_cols;
- unsigned short ts_xxx;
- unsigned short ts_yyy;
-};
-#define TIOCGSIZE TIOCGWINSZ
-#define TIOCSSIZE TIOCSWINSZ
-
#include <sys/ioccom.h>
#include <sys/filio.h>
#include <sys/sockio.h>
+#include <sys/ttycom.h>
#endif /* !_SYS_IOCTL_H_ */