X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxtime.h;h=4eb55ba2f594b221a4bed9a7e7cf0eecfab26a92;hb=fa1db0dd22768f09a507674a30beb5b8a87bb35f;hp=333f895b690ce35772f893ca65b24e5e3e4f1a7d;hpb=10ce26c08f4e8ffe6ac636b1fec6a33a847b0d3a;p=gnulib.git

diff --git a/lib/xtime.h b/lib/xtime.h
index 333f895b6..4eb55ba2f 100644
--- a/lib/xtime.h
+++ b/lib/xtime.h
@@ -1,11 +1,11 @@
 /* xtime -- extended-resolution integer time stamps
 
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2013 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,35 +13,46 @@
    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.  */
 
 #ifndef XTIME_H_
 #define XTIME_H_ 1
 
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
+_GL_INLINE_HEADER_BEGIN
+#ifndef XTIME_INLINE
+# define XTIME_INLINE _GL_INLINE
+#endif
+
 /* xtime_t is a signed type used for time stamps.  It is an integer
    type that is a count of nanoseconds -- except for obsolescent hosts
    without sufficiently-wide integers, where it is a count of
    seconds.  */
-#if HAVE_LONG_LONG
+#if HAVE_LONG_LONG_INT
 typedef long long int xtime_t;
-# define XTIME_PRECISION 1000000000LL
+# define XTIME_PRECISION 1000000000
 #else
 # include <limits.h>
 typedef long int xtime_t;
 # if LONG_MAX >> 31 >> 31 == 0
-#  define XTIME_PRECISION 1L
+#  define XTIME_PRECISION 1
 # else
-#  define XTIME_PRECISION 1000000000L
+#  define XTIME_PRECISION 1000000000
 # endif
 #endif
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 /* Return an extended time value that contains S seconds and NS
    nanoseconds, without any overflow checking.  */
-static inline xtime_t
-xtime_make (xtime_t s, int ns)
+XTIME_INLINE xtime_t
+xtime_make (xtime_t s, long int ns)
 {
   if (XTIME_PRECISION == 1)
     return s;
@@ -50,38 +61,42 @@ xtime_make (xtime_t s, int ns)
 }
 
 /* Return the number of seconds in T, which must be nonnegative.  */
-static inline xtime_t
+XTIME_INLINE xtime_t
 xtime_nonnegative_sec (xtime_t t)
 {
   return t / XTIME_PRECISION;
 }
 
 /* Return the number of seconds in T.  */
-static inline xtime_t
+XTIME_INLINE xtime_t
 xtime_sec (xtime_t t)
 {
   return (XTIME_PRECISION == 1
-	  ? t
-	  : t < 0
-	  ? (t + XTIME_PRECISION - 1) / XTIME_PRECISION - 1
-	  : xtime_nonnegative_sec (t));
+          ? t
+          : t < 0
+          ? (t + XTIME_PRECISION - 1) / XTIME_PRECISION - 1
+          : xtime_nonnegative_sec (t));
 }
 
 /* Return the number of nanoseconds in T, which must be nonnegative.  */
-static inline int
+XTIME_INLINE long int
 xtime_nonnegative_nsec (xtime_t t)
 {
   return t % XTIME_PRECISION;
 }
 
 /* Return the number of nanoseconds in T.  */
-static inline int
+XTIME_INLINE long int
 xtime_nsec (xtime_t t)
 {
-  int ns = t % XTIME_PRECISION;
+  long int ns = t % XTIME_PRECISION;
   if (ns < 0)
     ns += XTIME_PRECISION;
   return ns;
 }
 
+#ifdef  __cplusplus
+}
+#endif
+
 #endif