PowerPC: clean BSD Terminal Modes expectation in termios.h
Commit Message
This patch guard the BSD definition for terminal modes in PowerPC
specific header fixing the following conformance failures:
FAIL: conform/POSIX/termios.h/conform
FAIL: conform/POSIX2008/termios.h/conform
FAIL: conform/UNIX98/termios.h/conform
--
* sysdeps/unix/sysv/linux/powerpc/bits/termios.h [__USE_MISC]: Guard
BSD terminal modes definitions.
---
Comments
Adhemerval Zanella <azanella@linux.vnet.ibm.com> writes:
> diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/termios.h b/sysdeps/unix/sysv/linux/powerpc/bits/termios.h
> index de57249..c300f65 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/bits/termios.h
> +++ b/sysdeps/unix/sysv/linux/powerpc/bits/termios.h
> @@ -95,8 +95,10 @@ struct termios {
> # define NLDLY 00001400
> # define NL0 00000000
> # define NL1 00000400
> +#if defined __USE_MISC
> # define NL2 00001000
> # define NL3 00001400
> +#endif
Please maintain consistent indentation.
Andreas.
On 07-05-2014 09:40, Andreas Schwab wrote:
> Adhemerval Zanella <azanella@linux.vnet.ibm.com> writes:
>
>> diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/termios.h b/sysdeps/unix/sysv/linux/powerpc/bits/termios.h
>> index de57249..c300f65 100644
>> --- a/sysdeps/unix/sysv/linux/powerpc/bits/termios.h
>> +++ b/sysdeps/unix/sysv/linux/powerpc/bits/termios.h
>> @@ -95,8 +95,10 @@ struct termios {
>> # define NLDLY 00001400
>> # define NL0 00000000
>> # define NL1 00000400
>> +#if defined __USE_MISC
>> # define NL2 00001000
>> # define NL3 00001400
>> +#endif
> Please maintain consistent indentation.
>
> Andreas.
>
Thanks for catching it, is it ok to apply?
On 07-05-2014 09:53, Adhemerval Zanella wrote:
> On 07-05-2014 09:40, Andreas Schwab wrote:
>> Adhemerval Zanella <azanella@linux.vnet.ibm.com> writes:
>>
>>> diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/termios.h b/sysdeps/unix/sysv/linux/powerpc/bits/termios.h
>>> index de57249..c300f65 100644
>>> --- a/sysdeps/unix/sysv/linux/powerpc/bits/termios.h
>>> +++ b/sysdeps/unix/sysv/linux/powerpc/bits/termios.h
>>> @@ -95,8 +95,10 @@ struct termios {
>>> # define NLDLY 00001400
>>> # define NL0 00000000
>>> # define NL1 00000400
>>> +#if defined __USE_MISC
>>> # define NL2 00001000
>>> # define NL3 00001400
>>> +#endif
>> Please maintain consistent indentation.
>>
>> Andreas.
>>
> Thanks for catching it, is it ok to apply?
>
ping.
On 08-05-2014 12:00, Adhemerval Zanella wrote:
> On 07-05-2014 09:53, Adhemerval Zanella wrote:
>> On 07-05-2014 09:40, Andreas Schwab wrote:
>>> Adhemerval Zanella <azanella@linux.vnet.ibm.com> writes:
>>>
>>>> diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/termios.h b/sysdeps/unix/sysv/linux/powerpc/bits/termios.h
>>>> index de57249..c300f65 100644
>>>> --- a/sysdeps/unix/sysv/linux/powerpc/bits/termios.h
>>>> +++ b/sysdeps/unix/sysv/linux/powerpc/bits/termios.h
>>>> @@ -95,8 +95,10 @@ struct termios {
>>>> # define NLDLY 00001400
>>>> # define NL0 00000000
>>>> # define NL1 00000400
>>>> +#if defined __USE_MISC
>>>> # define NL2 00001000
>>>> # define NL3 00001400
>>>> +#endif
>>> Please maintain consistent indentation.
>>>
>>> Andreas.
>>>
>> Thanks for catching it, is it ok to apply?
>>
> ping.
>
Ping, if no one opposes it, I'll commit tomorrow.
@@ -95,8 +95,10 @@ struct termios {
# define NLDLY 00001400
# define NL0 00000000
# define NL1 00000400
+#if defined __USE_MISC
# define NL2 00001000
# define NL3 00001400
+#endif
# define TABDLY 00006000
# define TAB0 00000000
# define TAB1 00002000
@@ -222,6 +224,8 @@ struct termios {
#define TCSADRAIN 1
#define TCSAFLUSH 2
+#ifdef __USE_MISC
+
struct sgttyb {
char sg_ispeed;
char sg_ospeed;
@@ -257,6 +261,7 @@ struct ltchars {
#define TIOCPKT_NOSTOP 16
#define TIOCPKT_DOSTOP 32
+
struct winsize {
unsigned short ws_row;
unsigned short ws_col;
@@ -319,3 +324,5 @@ struct termio {
#define N_HDLC 13 /* synchronous HDLC */
#define N_SYNC_PPP 14 /* synchronous PPP */
#define N_HCI 15 /* Bluetooth HCI UART */
+
+#endif /* __USE_MISC */