aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/mach/hurd/times.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2003-06-27 06:21:51 +0000
committerRoland McGrath <roland@gnu.org>2003-06-27 06:21:51 +0000
commit768a8fcdedbd58048fb85e41535b5fc9e4866a7a (patch)
tree02ff8e8dca4414de253f0714a80e7c3496590262 /sysdeps/mach/hurd/times.c
parent72541de928619746d4a4b909302807f449fa9309 (diff)
downloadglibc-768a8fcdedbd58048fb85e41535b5fc9e4866a7a.zip
glibc-768a8fcdedbd58048fb85e41535b5fc9e4866a7a.tar.gz
glibc-768a8fcdedbd58048fb85e41535b5fc9e4866a7a.tar.bz2
* sysdeps/mach/configure.in: Barf rather than define NO_CREATION_TIME.
* sysdeps/mach/configure: Regenerated. * sysdeps/mach/hurd/times.c (times_init): Function removed. (__times): Assume `creation_time' field is available. * sysdeps/mach/hurd/Makefile [$(subdir) = csu] (sysdep_routines): Don't append set-init. * sysdeps/mach/hurd/set-init.c: File removed.
Diffstat (limited to 'sysdeps/mach/hurd/times.c')
-rw-r--r--sysdeps/mach/hurd/times.c20
1 files changed, 2 insertions, 18 deletions
diff --git a/sysdeps/mach/hurd/times.c b/sysdeps/mach/hurd/times.c
index 4d537ca..542f23d 100644
--- a/sysdeps/mach/hurd/times.c
+++ b/sysdeps/mach/hurd/times.c
@@ -1,5 +1,5 @@
/* Return CPU and real time used by process and its children. Hurd version.
- Copyright (C) 2001,02 Free Software Foundation, Inc.
+ Copyright (C) 2001,2002,2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -33,17 +33,6 @@ clock_from_time_value (const time_value_t *t)
return t->seconds * 1000000 + t->microseconds;
}
-#if NO_CREATION_TIME
-static time_value_t startup_time;
-static void times_init (void) __attribute__ ((unused));
-static void
-times_init (void)
-{
- __gettimeofday ((struct timeval *) &startup_time, NULL);
-}
-text_set_element (__libc_subinit, times_init);
-#endif
-
/* Store the CPU time used by this process and all its
dead children (and their dead children) in BUFFER.
Return the elapsed real time, or (clock_t) -1 for errors.
@@ -80,12 +69,7 @@ __times (struct tms *tms)
if (__gettimeofday ((struct timeval *) &now, NULL) < 0)
return -1;
-#if NO_CREATION_TIME
-# define our_creation_time startup_time
-#else
-# define our_creation_time bi.creation_time
-#endif
return (clock_from_time_value (&now)
- - clock_from_time_value (&our_creation_time));
+ - clock_from_time_value (&bi.creation_time));
}
weak_alias (__times, times)