X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgettime.c;h=0f94297da880cf3ac736bf539e0ab28a5b972cc8;hb=41f33021bba216bf24c5d93951fbede15390ea92;hp=715d1916a3d0ddd8081cefe604488e1db51f4449;hpb=ae218aeb74edf96e6d3959d80a6ba643a0674cf8;p=gnulib.git

diff --git a/lib/gettime.c b/lib/gettime.c
index 715d1916a..0f94297da 100644
--- a/lib/gettime.c
+++ b/lib/gettime.c
@@ -1,5 +1,5 @@
 /* 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
@@ -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,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert.  */
 
@@ -23,37 +23,31 @@
 
 #include "timespec.h"
 
-/* Get the system time.  */
+/* Get the system time into *TS.  */
 
-int
+void
 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)
-    return 0;
-#endif
+    return;
+# endif
 
-#if HAVE_GETTIMEOFDAY
+# if HAVE_GETTIMEOFDAY
   {
     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
 }