* m4/include_next.m4 (gl_INCLUDE_NEXT): Define and AC_SUBST

[pspp] / lib / sys_time_.h

diff --git a/lib/sys_time_.h b/lib/sys_time_.h
index 6fe31b5bf2e3d522faf8cedf6b2ff4c72572cb7f..08fac3c7ead95189f382bcba00a65a4fdcde03ec 100644 (file)
--- a/lib/sys_time_.h
+++ b/lib/sys_time_.h
@@ -19,18 +19,17 @@
 /* Written by Paul Eggert.  */
 
 #ifndef _GL_SYS_TIME_H
-#define _GL_SYS_TIME_H
 
+/* The include_next requires a split double-inclusion guard.  */
 #if @HAVE_SYS_TIME_H@
-# if @HAVE_INCLUDE_NEXT@
-#  include_next <sys/time.h>
-# else
-#  include @ABSOLUTE_SYS_TIME_H@
-# endif
+# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
 #else
 # include <time.h>
 #endif
 
+#ifndef _GL_SYS_TIME_H
+#define _GL_SYS_TIME_H
+
 #if ! @HAVE_STRUCT_TIMEVAL@
 struct timeval
 {
@@ -46,3 +45,4 @@ int gettimeofday (struct timeval *restrict, void *restrict);
 #endif
 
 #endif /* _GL_SYS_TIME_H */
+#endif /* _GL_SYS_TIME_H */