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>

diff --git a/ChangeLog b/ChangeLog
index ac19febdaa610045dc9944ff3af8e06d435b1f6e..8d890808ee31763e006a7c23d213a8cc1dffbae5 100644 (file)
--- 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.

diff --git a/tests/test-dup2.c b/tests/test-dup2.c
index b65fcad614e6f29941703ec4abac463a326ba1e0..eddf5ae200481e66d36d17ae25908a1f6e7aad85 100644 (file)
--- a/tests/test-dup2.c
+++ b/tests/test-dup2.c
@@ -57,11 +57,12 @@ is_open (int fd)
 #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 @@ is_inheritable (int fd)
   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 ()