diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-04-19 23:50:12 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-04-19 23:50:12 +0200 |
| commit | a564872d2d4237dda098b77ccfa081bf9dda39af (patch) | |
| tree | bc93b8ad1dcc9b4a69e260be35aae93cb6040456 | |
| parent | ed37092475495aee5651057ad6e6dd8e2af7006f (diff) | |
| download | glibc-a564872d2d4237dda098b77ccfa081bf9dda39af.tar.gz glibc-a564872d2d4237dda098b77ccfa081bf9dda39af.tar.xz glibc-a564872d2d4237dda098b77ccfa081bf9dda39af.zip | |
hurd: Fix termios.h symbols
* bits/termios.h [__USE_XOPEN || __USE_XOPEN2K8] (IXANY): Define. [__USE_XOPEN && !__USE_XOPEN2K] (IUCLC, OLCUC): Define. [__USE_XOPEN] (OFDEL): New macro. [__USE_XOPEN && !__USE_XOPEN2K] (XCASE): New macro.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | bits/termios.h | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 337eb6b35e..12ab0d6018 100644 --- a/ChangeLog +++ b/ChangeLog @@ -79,6 +79,10 @@ sigevent's sigev_notify_attributes field a pthread_attr_t*. * bits/types/siginfo_t.h: Remove siginfo struct name, unused and non-compliant. + * bits/termios.h [__USE_XOPEN || __USE_XOPEN2K8] (IXANY): Define. + [__USE_XOPEN && !__USE_XOPEN2K] (IUCLC, OLCUC): Define. + [__USE_XOPEN] (OFDEL): New macro. + [__USE_XOPEN && !__USE_XOPEN2K] (XCASE): New macro. 2018-04-18 Joseph Myers <joseph@codesourcery.com> diff --git a/bits/termios.h b/bits/termios.h index 9fc526e765..c6d572bbc3 100644 --- a/bits/termios.h +++ b/bits/termios.h @@ -123,13 +123,13 @@ struct termios #define ICRNL (1 << 8) /* Map CR to NL on input. */ #define IXON (1 << 9) /* Enable start/stop output control. */ #define IXOFF (1 << 10) /* Enable start/stop input control. */ -#if defined __USE_MISC || defined __USE_UNIX98 +#if defined __USE_MISC || defined __USE_XOPEN || defined __USE_XOPEN2K8 # define IXANY (1 << 11) /* Any character will restart after stop. */ #endif #ifdef __USE_MISC # define IMAXBEL (1 << 13) /* Ring bell when input queue is full. */ #endif -#ifdef __USE_GNU +#if defined __USE_GNU || (defined __USE_XOPEN && !defined __USE_XOPEN2K) # define IUCLC (1 << 14) /* Translate upper case input to lower case. */ #endif @@ -172,11 +172,12 @@ struct termios # define VT0 (0 << 16) /* VT delay type 0. */ # define VT1 (1 << 16) /* VT delay type 1. */ #endif /* __USE_MISC || __USE_XOPEN */ -#ifdef __USE_GNU +#if defined __USE_GNU || (defined __USE_XOPEN && !defined __USE_XOPEN2K) # define OLCUC (1 << 17) /* Translate lower case output to upper case */ #endif #ifdef __USE_XOPEN # define OFILL (1 << 18) /* Send fill characters for delays. */ +# define OFDEL (1 << 19) /* Fill is DEL. */ #endif /* Control modes. */ @@ -237,6 +238,11 @@ struct termios #define TOSTOP _TOSTOP #ifdef __USE_MISC # define FLUSHO (1 << 23) /* Output being flushed (state). */ +#endif +#if defined __USE_XOPEN && !defined __USE_XOPEN2K +# define XCASE (1 << 24) /* Canonical upper/lower case. */ +#endif +#ifdef __USE_MISC # define NOKERNINFO (1 << 25) /* Disable VSTATUS. */ # define PENDIN (1 << 29) /* Retype pending input (state). */ #endif |