X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgettime.c;h=1b8533637dab31439c520e994672debc7b2a3c23;hb=b6d87f536521a59758453d8dbd071e7cd6efc39d;hp=7b5a75aaf69185d48d56c8abd631c0ac155f16d0;hpb=51907d763eb8f5ecad76c0bc88dabf7e0e528b6b;p=gnulib.git
diff --git a/lib/gettime.c b/lib/gettime.c
index 7b5a75aaf..1b8533637 100644
--- a/lib/gettime.c
+++ b/lib/gettime.c
@@ -1,10 +1,11 @@
/* gettime -- get the system clock
- Copyright (C) 2002 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 2002, 2004, 2005, 2006, 2007 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
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,35 +13,36 @@
GNU General Public License for more details.
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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
/* Written by Paul Eggert. */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include
#include "timespec.h"
-/* Get the system time. */
+#include
-int
+/* Get the system time into *TS. */
+
+void
gettime (struct timespec *ts)
{
-#if defined CLOCK_REALTIME && HAVE_CLOCK_SETTIME
+#if HAVE_NANOTIME
+ nanotime (ts);
+#else
+
+# if defined CLOCK_REALTIME && HAVE_CLOCK_GETTIME
if (clock_gettime (CLOCK_REALTIME, ts) == 0)
- return 0;
-#endif
+ return;
+# endif
{
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;
}
+
+#endif
}