From owner-svn-src-all@FreeBSD.ORG  Sat May  9 19:01:25 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2FA2F10656C4;
	Sat,  9 May 2009 19:01:25 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1E71E8FC12;
	Sat,  9 May 2009 19:01:25 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n49J1Ppf031799;
	Sat, 9 May 2009 19:01:25 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n49J1PDO031798;
	Sat, 9 May 2009 19:01:25 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200905091901.n49J1PDO031798@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Sat, 9 May 2009 19:01:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191947 - head/sys/sys
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 May 2009 19:01:25 -0000

Author: ed
Date: Sat May  9 19:01:24 2009
New Revision: 191947
URL: http://svn.freebsd.org/changeset/base/191947

Log:
  Clean up <sys/ioctl.h>.
  
  - Just use #error when including <sys/ioctl.h> 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.

Modified:
  head/sys/sys/ioctl.h

Modified: head/sys/sys/ioctl.h
==============================================================================
--- head/sys/sys/ioctl.h	Sat May  9 19:00:47 2009	(r191946)
+++ head/sys/sys/ioctl.h	Sat May  9 19:01:24 2009	(r191947)
@@ -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_ */