summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-10-14 12:59:45 +0000
committerUlrich Drepper <drepper@redhat.com>1998-10-14 12:59:45 +0000
commit6f100d04b0faec0d809e5d244493cb56ba9de348 (patch)
tree07fee816d19290e62ec90fd3ed67068f78b3f126
parentUpdate. (diff)
downloadglibc-6f100d04b0faec0d809e5d244493cb56ba9de348.tar.gz
glibc-6f100d04b0faec0d809e5d244493cb56ba9de348.tar.bz2
glibc-6f100d04b0faec0d809e5d244493cb56ba9de348.zip
* sysdeps/unix/sysv/linux/alpha/bits/ioctls.h: Define __kernel_termios here instead of including kernel_termios.h.
-rw-r--r--ChangeLog3
-rw-r--r--localedata/ChangeLog6
-rw-r--r--sysdeps/unix/sysv/linux/alpha/bits/ioctls.h15
3 files changed, 23 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 44a0838f08..e18e4585c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
* version.h (VERSION): Bump to 2.0.98.
+ * sysdeps/unix/sysv/linux/alpha/bits/ioctls.h: Define __kernel_termios
+ here instead of including kernel_termios.h.
+
1998-10-14 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/opendir.c (__opendir): Remove label lose2 which is
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 0ad3378a2f..30e1724fcb 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,9 @@
+1998-10-14 Ulrich Drepper <drepper@cygnus.com>
+
+ * locales/gr_GR: Renamed to...
+ * locales/el_GR: ...this.
+ (yesexpr, noexpr): Also allow yes and no.
+
1998-09-25 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* locales/sr_YU: Add repertoiremap.
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/ioctls.h b/sysdeps/unix/sysv/linux/alpha/bits/ioctls.h
index dcbf9f4402..a30035cee5 100644
--- a/sysdeps/unix/sysv/linux/alpha/bits/ioctls.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/ioctls.h
@@ -22,7 +22,20 @@
/* Use the definitions from the kernel header files. */
#include <asm/ioctls.h>
-#include <kernel_termios.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. */