From da7e5864c601fa0c235cd15ed5144d65f5e5ffe7 Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Sat, 9 May 2009 19:01:24 +0000 Subject: Clean up . - Just use #error when including in the kernel. Code hasn't used this header for years now and probably doesn't compile anyway, because of -Werror. - Get rid of struct ttysize, TIOCGSIZE and TIOCSSIZE. All code nowadays use both TIOC[GS]SIZE and TIOC[GS]WINSZ. Because we have other popular systems that don't implement the first, it's of little use to support interfaces nowadays. --- sys/sys/ioctl.h | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) (limited to 'sys') 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 - -/* - * 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 #include #include +#include #endif /* !_SYS_IOCTL_H_ */ -- cgit v1.3