summaryrefslogtreecommitdiff
path: root/termios
diff options
context:
space:
mode:
Diffstat (limited to 'termios')
-rw-r--r--termios/Makefile4
-rw-r--r--termios/sys/ttychars.h10
-rw-r--r--termios/termios.h10
3 files changed, 14 insertions, 10 deletions
diff --git a/termios/Makefile b/termios/Makefile
index 13c5b08cd8..b637633e52 100644
--- a/termios/Makefile
+++ b/termios/Makefile
@@ -21,7 +21,9 @@
#
subdir := termios
-headers := termios.h termbits.h sys/ttydefaults.h sys/termios.h sys/ttychars.h
+headers := termios.h bits/termios.h sys/ttydefaults.h sys/termios.h \
+ sys/ttychars.h
+
routines := speed cfsetspeed tcsetattr tcgetattr tcgetpgrp tcsetpgrp \
tcdrain tcflow tcflush tcsendbrk cfmakeraw
diff --git a/termios/sys/ttychars.h b/termios/sys/ttychars.h
index 1a23aa7709..54674e1af8 100644
--- a/termios/sys/ttychars.h
+++ b/termios/sys/ttychars.h
@@ -38,8 +38,8 @@
*
* User visible structures and constants related to terminal handling.
*/
-#ifndef _SYS_TTYCHARS_H_
-#define _SYS_TTYCHARS_H_
+#ifndef _SYS_TTYCHARS_H
+#define _SYS_TTYCHARS_H 1
struct ttychars {
char tc_erase; /* erase last character */
@@ -57,7 +57,9 @@ struct ttychars {
char tc_werasc; /* word erase */
char tc_lnextc; /* literal next character */
};
-#ifdef USE_OLD_TTY
+
+#ifdef __USE_OLD_TTY
#include <sys/ttydefaults.h> /* to pick up character defaults */
#endif
-#endif /* !_SYS_TTYCHARS_H_ */
+
+#endif /* sys/ttychars.h */
diff --git a/termios/termios.h b/termios/termios.h
index f1a0fe2d17..342b0607a2 100644
--- a/termios/termios.h
+++ b/termios/termios.h
@@ -21,15 +21,15 @@
*/
#ifndef _TERMIOS_H
-
#define _TERMIOS_H 1
+
#include <features.h>
__BEGIN_DECLS
/* Get the system-dependent definitions of `struct termios', `tcflag_t',
`cc_t', `speed_t', and all the macros specifying the flag bits. */
-#include <termbits.h>
+#include <bits/termios.h>
#ifdef __USE_BSD
/* Compare a character C to a value VAL from the `c_cc' array in a
@@ -60,7 +60,7 @@ extern int __tcgetattr __P ((int __fd, struct termios *__termios_p));
extern int tcgetattr __P ((int __fd, struct termios *__termios_p));
/* Set the state of FD to *TERMIOS_P.
- Values for OPTIONAL_ACTIONS (TCSA*) are in <termbits.h>. */
+ Values for OPTIONAL_ACTIONS (TCSA*) are in <bits/termios.h>. */
extern int tcsetattr __P ((int __fd, int __optional_actions,
__const struct termios *__termios_p));
@@ -77,11 +77,11 @@ extern int tcsendbreak __P ((int __fd, int __duration));
extern int tcdrain __P ((int __fd));
/* Flush pending data on FD.
- Values for QUEUE_SELECTOR (TC{I,O,IO}FLUSH) are in <termbits.h>. */
+ Values for QUEUE_SELECTOR (TC{I,O,IO}FLUSH) are in <bits/termios.h>. */
extern int tcflush __P ((int __fd, int __queue_selector));
/* Suspend or restart transmission on FD.
- Values for ACTION (TC[IO]{OFF,ON}) are in <termbits.h>. */
+ Values for ACTION (TC[IO]{OFF,ON}) are in <bits/termios.h>. */
extern int tcflow __P ((int __fd, int __action));