summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-10-26 10:45:02 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-10-26 10:45:02 +0000
commit795399e2f5bbe8a2a1580eea2fb1990cab116112 (patch)
tree1ebdc7443e6027d8b343789e3fd5e3fa9500e0f2
parent2004-10-26 Ralf Corsepius <ralf_corsepius@rtems.org> (diff)
downloadrtems-795399e2f5bbe8a2a1580eea2fb1990cab116112.tar.bz2
2004-10-26 Ralf Corsepius <ralf_corsepius@rtems.org>
* libcsupport/include/sys/ioctl.h: Cosmetical update from FreeBSD. Remove sys/compat_ioctl.h section (Meaningless with RTEMS).
-rw-r--r--cpukit/ChangeLog2
-rw-r--r--cpukit/libcsupport/include/sys/ioctl.h19
2 files changed, 6 insertions, 15 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index dfa2d9fad6..41d984b23c 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -8,6 +8,8 @@
2004-10-26 Ralf Corsepius <ralf_corsepius@rtems.org>
* libcsupport/include/sys/ioccom.h: Cosmetical update from FreeBSD.
+ * libcsupport/include/sys/ioctl.h: Cosmetical update from FreeBSD.
+ Remove sys/compat_ioctl.h section (Meaningless with RTEMS).
2004-10-25 Eric Norum <norume@aps.anl.gov>
diff --git a/cpukit/libcsupport/include/sys/ioctl.h b/cpukit/libcsupport/include/sys/ioctl.h
index e3a69a5a7f..55e77d2ba2 100644
--- a/cpukit/libcsupport/include/sys/ioctl.h
+++ b/cpukit/libcsupport/include/sys/ioctl.h
@@ -15,10 +15,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
@@ -36,6 +32,10 @@
* SUCH DAMAGE.
*
* @(#)ioctl.h 8.6 (Berkeley) 3/28/94
+ * $FreeBSD: src/sys/sys/ioctl.h,v 1.13 2004/06/11 11:16:26 phk Exp $
+ */
+
+/*
* $Id$
*/
@@ -64,14 +64,3 @@ struct ttysize {
#include <sys/sockio.h>
#endif /* !_SYS_IOCTL_H_ */
-
-/*
- * Keep outside _SYS_IOCTL_H_
- * Compatibility with old terminal driver
- *
- * Source level -> #define USE_OLD_TTY
- * Kernel level -> options COMPAT_43 or COMPAT_SUNOS
- */
-#if defined(USE_OLD_TTY) || defined(COMPAT_43) || defined(COMPAT_SUNOS)
-#include <sys/ioctl_compat.h>
-#endif