X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgettime.c;h=6dbb4574c6c1a58e3e72705e550292dff3f8b8b8;hb=4cf71a8c15b38ca98e8b6aef03fe64dfbba51492;hp=528060733065df1ad0292436a19ef7285b6c36cd;hpb=eb557cbc75dafc5852f0aa5c1aa145b5ad514fbe;p=gnulib.git

diff --git a/lib/gettime.c b/lib/gettime.c
index 528060733..6dbb4574c 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-2007, 2009-2011 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 <http://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "timespec.h"
 
-/* Get the system time.  */
+#include <sys/time.h>
 
-int
+/* Get the system time into *TS.  */
+
+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
 
   {
     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
 }