mirrors/musl
1
0
Fork 0
mirror of https://git.musl-libc.org/git/musl synced 2025-01-06 23:02:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix regression with applications that expect struct winsize in ioctl.h

Browse Source 
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.
This commit is contained in:
Rich Felker 2020-08-30 16:47:40 -04:00
parent 86ac0f7947
commit 1ccc804e13
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/alltypes.h.in
View File

@ -77,6 +77,8 @@ TYPEDEF struct __sigset_t { unsigned long __bits[128/sizeof(long)]; } sigset_t;
STRUCT iovec { void *iov_base; size_t iov_len; }; STRUCT iovec { void *iov_base; size_t iov_len; };
STRUCT winsize { unsigned short ws_row, ws_col, ws_xpixel, ws_ypixel; };
TYPEDEF unsigned socklen_t; TYPEDEF unsigned socklen_t;
TYPEDEF unsigned short sa_family_t; TYPEDEF unsigned short sa_family_t;

2
include/sys/ioctl.h
View File

@ -4,6 +4,8 @@
extern "C" { extern "C" {
#endif #endif
#define __NEED_struct_winsize
#include <bits/alltypes.h> #include <bits/alltypes.h>
#include <bits/ioctl.h> #include <bits/ioctl.h>

8
include/termios.h
View File

@ -8,6 +8,7 @@ extern "C" {
#include <features.h> #include <features.h>
#define __NEED_pid_t #define __NEED_pid_t
#define __NEED_struct_winsize
#include <bits/alltypes.h> #include <bits/alltypes.h>
@ -15,13 +16,6 @@ typedef unsigned char cc_t;
typedef unsigned int speed_t; typedef unsigned int speed_t;
typedef unsigned int tcflag_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 #define NCCS 32
#include <bits/termios.h> #include <bits/termios.h>