Mercurial > hg > octave-kai > gnulib-hg
changeset 12553:5e5b39c63885
test-dup2: avoid compiler warning
A warning cropped up from the 2009-12-28 change, when not using cloexec.
* tests/test-dup2.c (is_inheritable): Only define if used.
Signed-off-by: Eric Blake <ebb9@byu.net>
| author | Eric Blake <ebb9@byu.net> |
|---|---|
| date | Thu, 31 Dec 2009 13:43:28 -0700 |
| parents | adc711ccbbd5 |
| children | 0774f328f2ff |
| files | ChangeLog tests/test-dup2.c |
| diffstat | 2 files changed, 13 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-12-31 Eric Blake <ebb9@byu.net> + + test-dup2: avoid compiler warning + * tests/test-dup2.c (is_inheritable): Only define if used. + 2010-01-01 Bruno Haible <bruno@clisp.org> vasnprintf: Avoid passing an 'rpl_mbstate_t *' to the system's wcrtomb.
--- a/tests/test-dup2.c +++ b/tests/test-dup2.c @@ -57,11 +57,12 @@ #endif } +#if GNULIB_CLOEXEC /* Return non-zero if FD is open and inheritable across exec/spawn. */ static int is_inheritable (int fd) { -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ /* On Win32, the initial state of unassigned standard file descriptors is that they are open but point to an INVALID_HANDLE_VALUE, and there is no fcntl. */ @@ -70,14 +71,15 @@ if (h == INVALID_HANDLE_VALUE || GetHandleInformation (h, &flags) == 0) return 0; return (flags & HANDLE_FLAG_INHERIT) != 0; -#else -# ifndef F_GETFD -# error Please port fcntl to your platform -# endif +# else +# ifndef F_GETFD +# error Please port fcntl to your platform +# endif int i = fcntl (fd, F_GETFD); return 0 <= i && (i & FD_CLOEXEC) == 0; -#endif +# endif } +#endif /* GNULIB_CLOEXEC */ #if !O_BINARY # define setmode(f,m) zero ()