From 977912ff930d404002f4086569c9ce6adb5db3ca Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 24 Mar 2016 15:32:33 +0100 Subject: [PATCH] Fix FIONBIO comments FIONBIO is defined in sys/termios.h and asm/socket.h. Align the comments. Remove unused REAL_FIONBIO. Signed-off-by: Corinna Vinschen --- winsup/cygwin/include/asm/socket.h | 4 ++-- winsup/cygwin/include/sys/termios.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/winsup/cygwin/include/asm/socket.h b/winsup/cygwin/include/asm/socket.h index b632a1b35..0eae36b85 100644 --- a/winsup/cygwin/include/asm/socket.h +++ b/winsup/cygwin/include/asm/socket.h @@ -24,8 +24,8 @@ details. */ #define SIOCATMARK _IOR('s', 7, long) /* at oob mark? */ #define FIONREAD _IOR('f', 127, long) /* get # bytes to read */ -#define FIONBIO 0x8004667e /* To be compatible with termiost version */ -#define REAL_FIONBIO _IOW('f', 126, long) /* set/clear non-blocking i/o */ +/* Compatible with termios.h */ +#define FIONBIO 0x8004667e /* set/clear non-blocking i/o */ #define FIOASYNC _IOW('f', 125, long) /* set/clear async i/o */ #define SIOCSHIWAT _IOW('s', 0, long) /* set high watermark */ #define SIOCGHIWAT _IOR('s', 1, long) /* get high watermark */ diff --git a/winsup/cygwin/include/sys/termios.h b/winsup/cygwin/include/sys/termios.h index fb6f3851b..4a39cbc6a 100644 --- a/winsup/cygwin/include/sys/termios.h +++ b/winsup/cygwin/include/sys/termios.h @@ -71,7 +71,8 @@ POSIX commands */ #define TIOCPKT_NOSTOP 16 #define TIOCPKT_DOSTOP 32 -#define FIONBIO 0x8004667e /* To be compatible with socket version */ +/* Compatible with asm/socket.h */ +#define FIONBIO 0x8004667e /* set/clear non-blocking i/o */ #define CTRL(ch) ((ch)&0x1F)