From: deraadt <deraadt@openbsd.org>
Date: Thu, 15 Jan 2015 00:48:10 +0000 (+0000)
Subject: I bet the reference to <sys/ttycom.h> near the ldisc list in tty(4)
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=b50eeac5933cfe570147dba215849e615e0d62b8;p=openbsd

I bet the reference to <sys/ttycom.h> near the ldisc list in tty(4)
led this program and the associated manual pages to including that
file directly, rather than the canonical include path of <sys/ioctl.h>
discussed with millert
---

diff --git a/sbin/ldattach/ldattach.c b/sbin/ldattach/ldattach.c
index 7d10f7066b3..43045550d22 100644
--- a/sbin/ldattach/ldattach.c
+++ b/sbin/ldattach/ldattach.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldattach.c,v 1.15 2014/08/10 02:09:35 guenther Exp $	*/
+/*	$OpenBSD: ldattach.c,v 1.16 2015/01/15 00:48:10 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2007, 2008 Marc Balmer <mbalmer@openbsd.org>
@@ -27,7 +27,7 @@
 #include <sys/limits.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
-#include <sys/ttycom.h>
+#include <sys/ioctl.h>
 
 #include <err.h>
 #include <errno.h>
diff --git a/share/man/man4/endrun.4 b/share/man/man4/endrun.4
index 19f683c4797..daf2d47ea04 100644
--- a/share/man/man4/endrun.4
+++ b/share/man/man4/endrun.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: endrun.4,v 1.2 2009/05/06 18:55:29 stevesk Exp $
+.\"	$OpenBSD: endrun.4,v 1.3 2015/01/15 00:48:10 deraadt Exp $
 .\"
 .\" Copyright (c) 2008 Marc Balmer <mbalmer@openbsd.org>
 .\" Copyright (c) 2009 Kevin Steves <stevesk@openbsd.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: May 6 2009 $
+.Dd $Mdocdate: January 15 2015 $
 .Dt ENDRUN 4
 .Os
 .Sh NAME
@@ -28,7 +28,7 @@ This line discipline interfaces serial EndRun Technologies devices.
 .Pp
 The line discipline is enabled by the following sequence:
 .Bd -literal -offset indent
-#include <sys/ttycom.h>
+#include <sys/ioctl.h>
 int ldisc = ENDRUNDISC, fildes; ...
 ioctl(fildes, TIOCSETD, &ldisc);
 .Ed
diff --git a/share/man/man4/msts.4 b/share/man/man4/msts.4
index 0aeca925676..827f5e1e6e2 100644
--- a/share/man/man4/msts.4
+++ b/share/man/man4/msts.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: msts.4,v 1.3 2013/07/16 16:05:49 schwarze Exp $
+.\"	$OpenBSD: msts.4,v 1.4 2015/01/15 00:48:10 deraadt Exp $
 .\"
 .\" Copyright (c) 2008 Marc Balmer <mbalmer@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 16 2013 $
+.Dd $Mdocdate: January 15 2015 $
 .Dt MSTS 4
 .Os
 .Sh NAME
@@ -27,7 +27,7 @@ This line discipline interfaces serial Meinberg devices.
 .Pp
 The line discipline is enabled by the following sequence:
 .Bd -literal -offset indent
-#include <sys/ttycom.h>
+#include <sys/ioctl.h>
 int ldisc = MSTSDISC, fildes; ...
 ioctl(fildes, TIOCSETD, &ldisc);
 .Ed
diff --git a/share/man/man4/nmea.4 b/share/man/man4/nmea.4
index 23289d8e93d..98627f13c73 100644
--- a/share/man/man4/nmea.4
+++ b/share/man/man4/nmea.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: nmea.4,v 1.24 2013/07/16 16:05:49 schwarze Exp $
+.\"	$OpenBSD: nmea.4,v 1.25 2015/01/15 00:48:10 deraadt Exp $
 .\"
 .\" Copyright (c) 2006, 2007 Marc Balmer <mbalmer@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 16 2013 $
+.Dd $Mdocdate: January 15 2015 $
 .Dt NMEA 4
 .Os
 .Sh NAME
@@ -28,7 +28,7 @@ such as GPS receivers attached to a serial or USB port.
 .Pp
 The line discipline is enabled by the following sequence:
 .Bd -literal -offset indent
-#include <sys/ttycom.h>
+#include <sys/ioctl.h>
 int ldisc = NMEADISC, fildes; ...
 ioctl(fildes, TIOCSETD, &ldisc);
 .Ed