From 87006e277f9cbc4e2a611af2b1916d5068227c78 Mon Sep 17 00:00:00 2001 From: Bananymous Date: Thu, 9 Jul 2026 23:25:21 +0300 Subject: [PATCH] LibC: Define winsize in both termios.h and sys/ioctl.h --- .../LibC/include/bits/types/winsize.h | 20 +++++++++++++++++++ userspace/libraries/LibC/include/sys/ioctl.h | 2 ++ userspace/libraries/LibC/include/termios.h | 10 ++-------- 3 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 userspace/libraries/LibC/include/bits/types/winsize.h diff --git a/userspace/libraries/LibC/include/bits/types/winsize.h b/userspace/libraries/LibC/include/bits/types/winsize.h new file mode 100644 index 00000000..9704e0bf --- /dev/null +++ b/userspace/libraries/LibC/include/bits/types/winsize.h @@ -0,0 +1,20 @@ +#ifndef _BITS_TYPES_WINSIZE_H +#define _BITS_TYPES_WINSIZE_H 1 + +// https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/termios.h.html + +#include + +__BEGIN_DECLS + +struct winsize +{ + unsigned short ws_row; + unsigned short ws_col; + unsigned short ws_xpixel; /* unused by kernel */ + unsigned short ws_ypixel; /* unused by kernel */ +}; + +__END_DECLS + +#endif diff --git a/userspace/libraries/LibC/include/sys/ioctl.h b/userspace/libraries/LibC/include/sys/ioctl.h index 9b700ec2..c198ef23 100644 --- a/userspace/libraries/LibC/include/sys/ioctl.h +++ b/userspace/libraries/LibC/include/sys/ioctl.h @@ -7,6 +7,8 @@ __BEGIN_DECLS #include +#include + #define I_ATMARK 1 #define I_CANPUT 2 #define I_CKBAND 3 diff --git a/userspace/libraries/LibC/include/termios.h b/userspace/libraries/LibC/include/termios.h index 1362aebc..b3012b50 100644 --- a/userspace/libraries/LibC/include/termios.h +++ b/userspace/libraries/LibC/include/termios.h @@ -10,6 +10,8 @@ __BEGIN_DECLS #define __need_pid_t #include +#include + typedef unsigned int cc_t; typedef unsigned int speed_t; typedef unsigned int tcflag_t; @@ -39,14 +41,6 @@ struct termios speed_t c_ispeed; }; -struct winsize -{ - unsigned short ws_row; - unsigned short ws_col; - unsigned short ws_xpixel; /* unused by kernel */ - unsigned short ws_ypixel; /* unused by kernel */ -}; - #define BRKINT 0x001 #define ICRNL 0x002 #define IGNBRK 0x004