# HG changeset patch # User Bruno Haible # Date 1261689411 -3600 # Node ID 7aad334c08d781b2cd484a5171ce0deaff8e6a17 # Parent e2d59f164e76b286105c6fa5d5ed433f7832c6f7 binary-io: Avoid gcc warning due to SET_BINARY. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +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. diff --git a/lib/binary-io.h b/lib/binary-io.h --- 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 */