projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sync with libc.
[gnulib.git]
/
lib
/
gettime.c
diff --git
a/lib/gettime.c
b/lib/gettime.c
index
715d191
..
929dece
100644
(file)
--- a/
lib/gettime.c
+++ b/
lib/gettime.c
@@
-1,5
+1,5
@@
/* gettime -- get the system clock
/* gettime -- get the system clock
- Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004
, 2005
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-23,37
+23,31
@@
#include "timespec.h"
#include "timespec.h"
-/* Get the system time. */
+/* Get the system time
into *TS
. */
-int
+void
gettime (struct timespec *ts)
{
gettime (struct timespec *ts)
{
-#if defined CLOCK_REALTIME && HAVE_CLOCK_GETTIME
+#if HAVE_NANOTIME
+ nanotime (ts);
+#else
+
+# if defined CLOCK_REALTIME && HAVE_CLOCK_GETTIME
if (clock_gettime (CLOCK_REALTIME, ts) == 0)
if (clock_gettime (CLOCK_REALTIME, ts) == 0)
- return
0
;
-#endif
+ return;
+#
endif
-#if HAVE_GETTIMEOFDAY
+#
if HAVE_GETTIMEOFDAY
{
struct timeval tv;
{
struct timeval tv;
- if (gettimeofday (&tv, 0) == 0)
- {
- ts->tv_sec = tv.tv_sec;
- ts->tv_nsec = tv.tv_usec * 1000;
- return 0;
- }
+ gettimeofday (&tv, NULL);
+ ts->tv_sec = tv.tv_sec;
+ ts->tv_nsec = tv.tv_usec * 1000;
}
}
-#endif
+# else
+ ts->tv_sec = time (NULL);
+ ts->tv_nsec = 0;
+# endif
- {
- time_t t = time (0);
- if (t != (time_t) -1)
- {
- ts->tv_sec = t;
- ts->tv_nsec = 0;
- return 0;
- }
- }
-
- return -1;
+#endif
}
}