* 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 a377c65311884b38286dd970e4ad2fca4f32c901..08fac3c7ead95189f382bcba00a65a4fdcde03ec 100644 (file)
--- a/lib/sys_time_.h
+++ b/lib/sys_time_.h
@@ -18,15 +18,18 @@
 
 /* Written by Paul Eggert.  */
 
-#ifndef _gl_SYS_TIME_H
-#define _gl_SYS_TIME_H
+#ifndef _GL_SYS_TIME_H
 
+/* The include_next requires a split double-inclusion guard.  */
 #if @HAVE_SYS_TIME_H@
-# include @ABSOLUTE_SYS_TIME_H@
+# @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
 {
@@ -35,10 +38,11 @@ struct timeval
 };
 #endif
 
-#if @GETTIMEOFDAY_REPLACEMENT@
+#if @REPLACE_GETTIMEOFDAY@
 # undef gettimeofday
 # define gettimeofday rpl_gettimeofday
 int gettimeofday (struct timeval *restrict, void *restrict);
 #endif
 
-#endif /* _gl_SYS_TIME_H */
+#endif /* _GL_SYS_TIME_H */
+#endif /* _GL_SYS_TIME_H */