From c73cdbdef5df3a834991ea510f262512dd2bdf82 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 24 Dec 2009 22:16:51 +0100 Subject: [PATCH] binary-io: Avoid gcc warning due to SET_BINARY. --- ChangeLog | 6 ++++++ lib/binary-io.h | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 72c649f2e..8b557bd9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2009-12-24 Bruno Haible + binary-io: Avoid gcc warning due to SET_BINARY. + * lib/binary-io.h (SET_BINARY): Cast the result to void. + Reported by Jim Meyering . Suggestion by Eric Blake. + +2009-12-24 Bruno Haible + Avoid future namespace pollution on glibc systems. * lib/arpa_inet.in.h: Don't include on glibc systems. * lib/sys_ioctl.in.h: Don't include on glibc systems. diff --git a/lib/binary-io.h b/lib/binary-io.h index 9851511b3..2c9ff7199 100644 --- a/lib/binary-io.h +++ b/lib/binary-io.h @@ -36,6 +36,9 @@ # undef O_BINARY # undef O_TEXT #endif + +/* SET_BINARY (fd); + changes the file descriptor fd to perform binary I/O. */ #if O_BINARY # if defined __EMX__ || defined __DJGPP__ || defined __CYGWIN__ # include /* declares setmode() */ @@ -49,15 +52,15 @@ /* Avoid putting stdin/stdout in binary mode if it is connected to the console, because that would make it impossible for the user to interrupt the program through Ctrl-C or Ctrl-Break. */ -# define SET_BINARY(fd) (!isatty (fd) ? (setmode (fd, O_BINARY), 0) : 0) +# define SET_BINARY(fd) ((void) (!isatty (fd) ? (setmode (fd, O_BINARY), 0) : 0)) # else -# define SET_BINARY(fd) setmode (fd, O_BINARY) +# define SET_BINARY(fd) ((void) setmode (fd, O_BINARY)) # endif #else /* On reasonable systems, binary I/O is the default. */ # undef O_BINARY # define O_BINARY 0 -# define SET_BINARY(fd) /* nothing */ +# define SET_BINARY(fd) /* do nothing */ ((void) 0) #endif #endif /* _BINARY_H */ -- 2.11.0