NEWS.stable: log cherry-pick [e446f25]->[c092018] relocatable-shell: Update suggested...

[gnulib.git] / lib / gethrxtime.c

diff --git a/lib/gethrxtime.c b/lib/gethrxtime.c
index 2046e06..788ef56 100644 (file)
--- a/lib/gethrxtime.c
+++ b/lib/gethrxtime.c
@@ -1,11 +1,11 @@
 /* gethrxtime -- get high resolution real time
 
-   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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
@@ -13,15 +13,17 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
 #include <config.h>
 
+#define GETHRXTIME_INLINE _GL_EXTERN_INLINE
 #include "gethrxtime.h"
 
+#if ! (HAVE_ARITHMETIC_HRTIME_T && HAVE_DECL_GETHRTIME)
+
 #include <sys/time.h>
 #include "timespec.h"
 
@@ -33,30 +35,30 @@
 xtime_t
 gethrxtime (void)
 {
-#if HAVE_NANOUPTIME
+# if HAVE_NANOUPTIME
   {
     struct timespec ts;
     nanouptime (&ts);
     return xtime_make (ts.tv_sec, ts.tv_nsec);
   }
-#else
+# else
 
-# if defined CLOCK_MONOTONIC && HAVE_CLOCK_GETTIME
+#  if defined CLOCK_MONOTONIC && HAVE_CLOCK_GETTIME
   {
     struct timespec ts;
     if (clock_gettime (CLOCK_MONOTONIC, &ts) == 0)
       return xtime_make (ts.tv_sec, ts.tv_nsec);
   }
-# endif
+#  endif
 
-# if HAVE_MICROUPTIME
+#  if HAVE_MICROUPTIME
   {
     struct timeval tv;
     microuptime (&tv);
     return xtime_make (tv.tv_sec, 1000 * tv.tv_usec);
   }
 
-# else
+#  else
   /* No monotonically increasing clocks are available; fall back on a
      clock that might jump backwards, since it's the best we can do.  */
   {
@@ -64,6 +66,8 @@ gethrxtime (void)
     gettime (&ts);
     return xtime_make (ts.tv_sec, ts.tv_nsec);
   }
+#  endif
 # endif
-#endif
 }
+
+#endif