aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv/linux
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-02-20 18:45:36 +0000
committerUlrich Drepper <drepper@redhat.com>1998-02-20 18:45:36 +0000
commitdfbad9c855e5aee39492fdc9fbe98eac5846f49c (patch)
treebacfee7faf9f5ce25185b712b01e4f4835e68651 /sysdeps/unix/sysv/linux
parent03e4219e7783eaa6d5cf1b02a79e00b857185e55 (diff)
downloadglibc-dfbad9c855e5aee39492fdc9fbe98eac5846f49c.tar
glibc-dfbad9c855e5aee39492fdc9fbe98eac5846f49c.tar.gz
glibc-dfbad9c855e5aee39492fdc9fbe98eac5846f49c.tar.bz2
glibc-dfbad9c855e5aee39492fdc9fbe98eac5846f49c.zip
Update.
1998-02-20 18:43 Ulrich Drepper <drepper@cygnus.com> * hesiod/hesiod.c: Pretty print. Don't use __ protected names. * iconvdata/8bit-gap.c: Likewise. * iconvdata/8bit-generic.c: Likewise. * iconvdata/iso6937.c: Likewise. * iconvdata/iso8859-1.c: Likewise. * iconvdata/sjis.c: Likewise. * iconvdata/t61.c: Likewise. 1998-02-20 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/bits/termios.h: Replace all negative feature tests by positive feature tests. 1998-02-19 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/unlockpt.c: Always return a value. 1998-02-20 Ulrich Drepper <drepper@cygnus.com> * elf/dlvsym.c (dlvsym_doit): More corrections. Patch by Andreas Jaeger.
Diffstat (limited to 'sysdeps/unix/sysv/linux')
-rw-r--r--sysdeps/unix/sysv/linux/bits/termios.h16
-rw-r--r--sysdeps/unix/sysv/linux/unlockpt.c5
2 files changed, 10 insertions, 11 deletions
diff --git a/sysdeps/unix/sysv/linux/bits/termios.h b/sysdeps/unix/sysv/linux/bits/termios.h
index 0a5891210e..09a3f98a36 100644
--- a/sysdeps/unix/sysv/linux/bits/termios.h
+++ b/sysdeps/unix/sysv/linux/bits/termios.h
@@ -82,7 +82,7 @@ struct termios
#define ONLRET 0000040
#define OFILL 0000100
#define OFDEL 0000200
-#if !defined __USE_POSIX || defined __USE_UNIX98
+#if defined __USE_MISC || defined __USE_UNIX98
# define NLDLY 0000400
# define NL0 0000000
# define NL1 0000400
@@ -108,12 +108,12 @@ struct termios
#define VT0 0000000
#define VT1 0040000
-#if (!defined __USE_POSIX && !defined __USE_XOPEN) || defined __USE_GNU
+#ifdef __USE_MISC
# define XTABS 0014000
#endif
/* c_cflag bit meaning */
-#if (!defined __USE_POSIX && !defined __USE_XOPEN) || defined __USE_GNU
+#ifdef __USE_MISC
# define CBAUD 0010017
#endif
#define B0 0000000 /* hang up */
@@ -132,7 +132,7 @@ struct termios
#define B9600 0000015
#define B19200 0000016
#define B38400 0000017
-#if (!defined __USE_POSIX && !defined __USE_XOPEN) || defined __USE_GNU
+#ifdef __USE_MISC
# define EXTA B19200
# define EXTB B38400
#endif
@@ -147,14 +147,14 @@ struct termios
#define PARODD 0001000
#define HUPCL 0002000
#define CLOCAL 0004000
-#if (!defined __USE_POSIX && !defined __USE_XOPEN) || defined __USE_GNU
+#ifdef __USE_MISC
# define CBAUDEX 0010000
#endif
#define B57600 0010001
#define B115200 0010002
#define B230400 0010003
#define B460800 0010004
-#if (!defined __USE_POSIX && !defined __USE_XOPEN) || defined __USE_GNU
+#ifdef __USE_MISC
# define CIBAUD 002003600000 /* input baud rate (not used) */
# define CRTSCTS 020000000000 /* flow control */
#endif
@@ -162,7 +162,7 @@ struct termios
/* c_lflag bits */
#define ISIG 0000001
#define ICANON 0000002
-#if !defined __USE_POSIX || defined __USE_UNIX98
+#if defined __USE_MISC || defined __USE_UNIX98
# define XCASE 0000004
#endif
#define ECHO 0000010
@@ -171,7 +171,7 @@ struct termios
#define ECHONL 0000100
#define NOFLSH 0000200
#define TOSTOP 0000400
-#if (!defined __USE_POSIX && !defined __USE_XOPEN) || defined __USE_GNU
+#ifdef __USE_MISC
# define ECHOCTL 0001000
# define ECHOPRT 0002000
# define ECHOKE 0004000
diff --git a/sysdeps/unix/sysv/linux/unlockpt.c b/sysdeps/unix/sysv/linux/unlockpt.c
index e508b280c5..a5f0b2a484 100644
--- a/sysdeps/unix/sysv/linux/unlockpt.c
+++ b/sysdeps/unix/sysv/linux/unlockpt.c
@@ -35,7 +35,7 @@ unlockpt (fd)
if (ioctl (fd, TIOCSPTLCK, &unlock))
{
- if(errno == EINVAL)
+ if (errno == EINVAL)
{
__set_errno (serrno);
return 0;
@@ -43,8 +43,7 @@ unlockpt (fd)
else
return -1;
}
-#else
+#endif
/* On pre-/dev/ptmx kernels this function should be a no-op. */
return 0;
-#endif
}