X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsys_times.in.h;h=413a3730e417006d0651884e93d72712a07ba665;hb=6e33eaed1cd5ddcdfc48476059012fed68f71f8e;hp=73e13eaa80902022d06d07ee362a6233e30aa336;hpb=d60f3b0c6b0f93a601acd1cfd3923f94ca05abb0;p=gnulib.git

diff --git a/lib/sys_times.in.h b/lib/sys_times.in.h
index 73e13eaa8..413a3730e 100644
--- a/lib/sys_times.in.h
+++ b/lib/sys_times.in.h
@@ -20,7 +20,7 @@
 /* This file is supposed to be used on platforms where <sys/times.h>
    is missing.  */
 
-#ifndef _GL_SYS_TIMES_H
+#ifndef _@GUARD_PREFIX@_SYS_TIMES_H
 
 # if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
@@ -31,7 +31,7 @@
 #  @INCLUDE_NEXT@ @NEXT_SYS_TIMES_H@
 # endif
 
-# define _GL_SYS_TIMES_H
+# define _@GUARD_PREFIX@_SYS_TIMES_H
 
 /* Get clock_t.
    But avoid namespace pollution on glibc systems.  */
@@ -48,6 +48,7 @@ extern "C" {
 # endif
 
 # if !@HAVE_STRUCT_TMS@
+#  if !GNULIB_defined_struct_tms
   /* Structure describing CPU time used by a process and its children.  */
   struct tms
   {
@@ -57,6 +58,8 @@ extern "C" {
     clock_t tms_cutime;         /* User CPU time of dead children.  */
     clock_t tms_cstime;         /* System CPU time of dead children.  */
   };
+#   define GNULIB_defined_struct_tms 1
+#  endif
 # endif
 
 # if @GNULIB_TIMES@
@@ -75,4 +78,4 @@ _GL_WARN_ON_USE (times, "times is unportable - "
 }
 # endif
 
-#endif                          /* _GL_SYS_TIMES_H */
+#endif                          /* _@GUARD_PREFIX@_SYS_TIMES_H */