diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/bits/ioctls.h | 25 |
2 files changed, 9 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog index 57c8ae4cf4..fca6c88dc2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1998-10-15 Ulrich Drepper <drepper@cygnus.com> + + * sysdeps/unix/sysv/linux/alpha/bits/ioctls.h: Remove __kernel_termios + again. Use char[44] to define size of the struct. + 1998-10-14 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * string/bits/string2.h (strcmp): Don't cache the result of diff --git a/sysdeps/unix/sysv/linux/alpha/bits/ioctls.h b/sysdeps/unix/sysv/linux/alpha/bits/ioctls.h index 7096b5a76a..7c1e0f7960 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/ioctls.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/ioctls.h @@ -20,35 +20,18 @@ # error "Never use <bits/ioctls.h> directly; include <sys/ioctl.h> instead." #endif -/* Get the necessary definitions. */ -#include <termios.h> - /* Use the definitions from the kernel header files. */ #include <asm/ioctls.h> -/* We need the kernel definition of the `termios' struct. */ -#define __KERNEL_NCCS 19 -struct __kernel_termios - { - tcflag_t c_iflag; /* input mode flags */ - tcflag_t c_oflag; /* output mode flags */ - tcflag_t c_cflag; /* control mode flags */ - tcflag_t c_lflag; /* local mode flags */ - cc_t c_cc[__KERNEL_NCCS]; /* control characters */ - cc_t c_line; /* line discipline */ - speed_t c_ispeed; /* input speed */ - speed_t c_ospeed; /* output speed */ - }; - /* Oh well, this is necessary since the kernel data structure is different from the user-level version. */ #undef TCGETS #undef TCSETS #undef TCSETSW #undef TCSETSF -#define TCGETS _IOR ('t', 19, struct __kernel_termios) -#define TCSETS _IOW ('t', 20, struct __kernel_termios) -#define TCSETSW _IOW ('t', 21, struct __kernel_termios) -#define TCSETSF _IOW ('t', 22, struct __kernel_termios) +#define TCGETS _IOR ('t', 19, char[44]) +#define TCSETS _IOW ('t', 20, char[44]) +#define TCSETSW _IOW ('t', 21, char[44]) +#define TCSETSF _IOW ('t', 22, char[44]) #include <linux/sockios.h> |