projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* socklen.m4 (gl_TYPE_SOCKLEN_T): Renamed from gl_SOCKLEN_T.
[gnulib.git]
/
lib
/
gettime.c
diff --git
a/lib/gettime.c
b/lib/gettime.c
index
5280607
..
0f94297
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 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
@@
-13,7
+13,7
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- Inc., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
/* Written by Paul Eggert. */
/* Written by Paul Eggert. */
@@
-23,24
+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
{
struct timeval tv;
{
struct timeval tv;
- int r = gettimeofday (&tv, 0);
- if (r == 0)
- {
- ts->tv_sec = tv.tv_sec;
- ts->tv_nsec = tv.tv_usec * 1000;
- }
- return r;
+ gettimeofday (&tv, NULL);
+ ts->tv_sec = tv.tv_sec;
+ ts->tv_nsec = tv.tv_usec * 1000;
}
}
+# else
+ ts->tv_sec = time (NULL);
+ ts->tv_nsec = 0;
+# endif
+
+#endif
}
}