From 1868523e007fea21d74f282eef2e9252d84411d9 Mon Sep 17 00:00:00 2001 From: Conrad Pankoff Date: Sun, 18 Aug 2019 12:22:49 +1000 Subject: [PATCH] LibC: Move duplicated winsize struct definition into ioctl_numbers.h --- Kernel/UnixTypes.h | 5 ----- Libraries/LibC/sys/ioctl.h | 5 ----- Libraries/LibC/sys/ioctl_numbers.h | 11 +++++++++++ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Kernel/UnixTypes.h b/Kernel/UnixTypes.h index 09ed93dda0..d23b48251c 100644 --- a/Kernel/UnixTypes.h +++ b/Kernel/UnixTypes.h @@ -215,11 +215,6 @@ #define TCSADRAIN 1 #define TCSAFLUSH 2 -struct winsize { - unsigned short ws_row; - unsigned short ws_col; -}; - typedef u32 dev_t; typedef u32 ino_t; typedef u16 mode_t; diff --git a/Libraries/LibC/sys/ioctl.h b/Libraries/LibC/sys/ioctl.h index 95d69f0504..3a2dcd0b5f 100644 --- a/Libraries/LibC/sys/ioctl.h +++ b/Libraries/LibC/sys/ioctl.h @@ -5,11 +5,6 @@ __BEGIN_DECLS -struct winsize { - unsigned short ws_row; - unsigned short ws_col; -}; - int ioctl(int fd, unsigned request, ...); __END_DECLS diff --git a/Libraries/LibC/sys/ioctl_numbers.h b/Libraries/LibC/sys/ioctl_numbers.h index dd6711c43c..26ec4548d5 100644 --- a/Libraries/LibC/sys/ioctl_numbers.h +++ b/Libraries/LibC/sys/ioctl_numbers.h @@ -1,5 +1,16 @@ #pragma once +#include + +__BEGIN_DECLS + +struct winsize { + unsigned short ws_row; + unsigned short ws_col; +}; + +__END_DECLS + enum IOCtlNumber { TIOCGPGRP, TIOCSPGRP,