From 807912915b065225c55bf0ac0277cb71fc394e6d Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Mon, 27 May 1996 20:16:19 +0000
Subject: * sysdeps/unix/sysv/linux/Makefile [$(subdir)=termios] (headers):

	Append termio.h.

	* Makefile ($(includedir)/stubs.h): Print a msg if we do nothing.

	* misc/sgtty.h: Add forward decl of struct sgttyb in case it is never
	defined.

	* sysdeps/unix/sysv/linux/termio.h: New file.
	* sysdeps/unix/sysv/linux/Dist: Add it.

	* sysdeps/unix/sysv/linux/ioctl-types.h: New file, wrapper around
	kernel header <asm/termios.h>.

	* misc/Makefile (headers): Add ioctl-types.h.
	* sysdeps/generic/ioctl-types.h: New file.
	* misc/sys/ioctl.h: Include <ioctl-types.h>.
	(struct tchars, struct ltchars, struct sgttyb, struct winsize,
	struct ttysize): Types moved there.
---
 sysdeps/unix/sysv/linux/Dist          |  1 +
 sysdeps/unix/sysv/linux/Makefile      |  4 ++++
 sysdeps/unix/sysv/linux/ioctl-types.h | 27 +++++++++++++++++++++++++++
 sysdeps/unix/sysv/linux/termio.h      |  6 ++++++
 4 files changed, 38 insertions(+)
 create mode 100644 sysdeps/unix/sysv/linux/ioctl-types.h
 create mode 100644 sysdeps/unix/sysv/linux/termio.h

(limited to 'sysdeps/unix/sysv')

diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist
index 526e1292fb..2ef1119325 100644
--- a/sysdeps/unix/sysv/linux/Dist
+++ b/sysdeps/unix/sysv/linux/Dist
@@ -5,3 +5,4 @@ sys/socketcall.h
 sys/sysctl.h
 sys/timex.h
 nfs/nfs.h
+termio.h
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 8c9fcfe934..406c338025 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -54,6 +54,10 @@ ifeq ($(subdir), sunrpc)
 headers += nfs/nfs.h
 endif
 
+ifeq ($(subdir), termios)
+headers += termio.h
+endif
+
 rtld-installed-name = ld-gnu.so.1
 
 # Don't compile the ctype glue code, since there is no old non-GNU C library.
diff --git a/sysdeps/unix/sysv/linux/ioctl-types.h b/sysdeps/unix/sysv/linux/ioctl-types.h
new file mode 100644
index 0000000000..101f2df80a
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/ioctl-types.h
@@ -0,0 +1,27 @@
+/* Structure types for pre-termios terminal ioctls.  Linux version.
+Copyright (C) 1996 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+
+The GNU C Library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 675 Mass Ave,
+Cambridge, MA 02139, USA.  */
+
+#ifndef _IOCTL_TYPES_H
+#define _IOCTL_TYPES_H 1
+
+/* The Linux kernel header defines the types associated with old ioctls.  */
+
+#include <asm/termios.h>
+
+#endif /* ioctl-types.h */
diff --git a/sysdeps/unix/sysv/linux/termio.h b/sysdeps/unix/sysv/linux/termio.h
new file mode 100644
index 0000000000..0e610f0c56
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/termio.h
@@ -0,0 +1,6 @@
+/* Compatible <termio.h> for old `struct termio' ioctl interface.
+   This is obsolete; use the POSIX.1 `struct termios' interface
+   defined in <termios.h> instead.  */
+
+#include <termios.h>
+#include <sys/ioctl.h>
-- 
cgit 1.4.1