This is the mail archive of the cygwin-cvs@cygwin.com mailing list for the Cygwin project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[newlib-cygwin] Fix FIONBIO comments


https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=977912ff930d404002f4086569c9ce6adb5db3ca

commit 977912ff930d404002f4086569c9ce6adb5db3ca
Author: Corinna Vinschen <corinna@vinschen.de>
Date:   Thu Mar 24 15:32:33 2016 +0100

    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 <corinna@vinschen.de>

Diff:
---
 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 b632a1b..0eae36b 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 fb6f385..4a39cbc 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)


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]