From: Bruno Haible Date: Sat, 12 May 2018 11:32:52 +0000 (+0200) Subject: execute, spawn-pipe: Avoid warning about redefining 'close'. X-Git-Tag: v1.0~5619 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=448e8d4a8c338f9783b90986d02cd4b8ff241280;p=gnulib.git execute, spawn-pipe: Avoid warning about redefining 'close'. Reported by Eli Zaretskii . * lib/execute.c: Undefine 'close' before redefining it. * lib/spawn-pipe.c: Likewise. --- diff --git a/ChangeLog b/ChangeLog index 95a4203631..1e77eb0859 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2018-05-12 Bruno Haible + + execute, spawn-pipe: Avoid warning about redefining 'close'. + Reported by Eli Zaretskii . + * lib/execute.c: Undefine 'close' before redefining it. + * lib/spawn-pipe.c: Likewise. + 2018-05-12 Bruno Haible nanosleep: Avoid test failure on mingw when it has nanosleep. diff --git a/lib/execute.c b/lib/execute.c index 45326610d0..1194dd6130 100644 --- a/lib/execute.c +++ b/lib/execute.c @@ -66,6 +66,7 @@ nonintr_close (int fd) return retval; } +#undef close /* avoid warning related to gnulib module unistd */ #define close nonintr_close static int diff --git a/lib/spawn-pipe.c b/lib/spawn-pipe.c index 716c54a6c7..ec9bd9dc0a 100644 --- a/lib/spawn-pipe.c +++ b/lib/spawn-pipe.c @@ -71,6 +71,7 @@ nonintr_close (int fd) return retval; } +#undef close /* avoid warning related to gnulib module unistd */ #define close nonintr_close #if defined _WIN32 && ! defined __CYGWIN__