about summary refs log tree commit diff
path: root/include/termios.h
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2020-08-30 16:47:40 -0400
committerRich Felker <dalias@aerifal.cx>2020-08-30 16:47:40 -0400
commit1ccc804e1345c6e59294f561ac43c3e55ccea1e4 (patch)
treec89aed676723d6bb87c8ce2d681ddc878a91ed16 /include/termios.h
parent86ac0f794731f03dfff40ee843ff9e2752945d5e (diff)
downloadmusl-1ccc804e1345c6e59294f561ac43c3e55ccea1e4.tar.gz
musl-1ccc804e1345c6e59294f561ac43c3e55ccea1e4.tar.xz
musl-1ccc804e1345c6e59294f561ac43c3e55ccea1e4.zip
fix regression with applications that expect struct winsize in ioctl.h
putting the (simple) definition in alltypes.h seems like the best
solution here. making sys/ioctl.h implicitly include termios.h is
probably excess namespace pollution.
Diffstat (limited to 'include/termios.h')
-rw-r--r--include/termios.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/include/termios.h b/include/termios.h
index 793cfc94..cbb53301 100644
--- a/include/termios.h
+++ b/include/termios.h
@@ -8,6 +8,7 @@ extern "C" {
 #include <features.h>
 
 #define __NEED_pid_t
+#define __NEED_struct_winsize
 
 #include <bits/alltypes.h>
 
@@ -15,13 +16,6 @@ typedef unsigned char cc_t;
 typedef unsigned int speed_t;
 typedef unsigned int tcflag_t;
 
-struct winsize {
-	unsigned short ws_row;
-	unsigned short ws_col;
-	unsigned short ws_xpixel;
-	unsigned short ws_ypixel;
-};
-
 #define NCCS 32
 
 #include <bits/termios.h>