* lib/sys_time_.h: Use a recursion-safe inclusion guard rather than

a split double-inclusion guard. Needed for cygwin, where <sys/time.h>
includes <cygwin/sys_time.h> which includes <sys/select.h> which
include <sys/time.h>.
Reported by Eric Blake.

diff --git a/ChangeLog b/ChangeLog
index 93e55649220e12908f4a2c76b6c8d93926f9044b..763bf9b42f0fa080438ca4c7f29e7d0b9474a7f4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-07-06  Bruno Haible  <bruno@clisp.org>
+
+       * lib/sys_time_.h: Use a recursion-safe inclusion guard rather than
+       a split double-inclusion guard. Needed for cygwin, where <sys/time.h>
+       includes <cygwin/sys_time.h> which includes <sys/select.h> which
+       include <sys/time.h>.
+       Reported by Eric Blake.
+
 2007-07-06  Eric Blake  <ebb9@byu.net>
 
        Fix testing canonicalize on cygwin.

diff --git a/lib/sys_time_.h b/lib/sys_time_.h
index 08fac3c7ead95189f382bcba00a65a4fdcde03ec..296d20df47b2934a424c42f69b3037e22bfa3c8d 100644 (file)
--- a/lib/sys_time_.h
+++ b/lib/sys_time_.h
@@ -18,31 +18,35 @@
 
 /* Written by Paul Eggert.  */
 
-#ifndef _GL_SYS_TIME_H
+#if defined _GL_SYS_TIME_H
+
+/* Simply delegate to the system's header, without adding anything.  */
+# if @HAVE_SYS_TIME_H@
+#  @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
+# endif
 
-/* The include_next requires a split double-inclusion guard.  */
-#if @HAVE_SYS_TIME_H@
-# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
 #else
-# include <time.h>
-#endif
 
-#ifndef _GL_SYS_TIME_H
-#define _GL_SYS_TIME_H
+# define _GL_SYS_TIME_H
+
+# if @HAVE_SYS_TIME_H@
+#  @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
+# else
+#  include <time.h>
+# endif
 
-#if ! @HAVE_STRUCT_TIMEVAL@
+# if ! @HAVE_STRUCT_TIMEVAL@
 struct timeval
 {
   time_t tv_sec;
   long int tv_usec;
 };
-#endif
+# endif
 
-#if @REPLACE_GETTIMEOFDAY@
-# undef gettimeofday
-# define gettimeofday rpl_gettimeofday
+# if @REPLACE_GETTIMEOFDAY@
+#  undef gettimeofday
+#  define gettimeofday rpl_gettimeofday
 int gettimeofday (struct timeval *restrict, void *restrict);
-#endif
+# endif
 
 #endif /* _GL_SYS_TIME_H */
-#endif /* _GL_SYS_TIME_H */