Improve name: "count-one-bits" is better than "popcount".

[gnulib.git] / lib / sys_time_.h

diff --git a/lib/sys_time_.h b/lib/sys_time_.h
index 253316f..296d20d 100644 (file)
--- a/lib/sys_time_.h
+++ b/lib/sys_time_.h
@@ -18,35 +18,35 @@
 
 /* Written by Paul Eggert.  */
 
-#ifndef _GL_SYS_TIME_H
+#if defined _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@
+/* Simply delegate to the system's header, without adding anything.  */
+# if @HAVE_SYS_TIME_H@
+#  @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
 # endif
+
 #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 */