X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxtime.h;h=1be9ad7681828477d8545da09e665baa1426fb6a;hb=d952dbeaa9ceb3f9cef0684e7d9d3ecfa71a6294;hp=8da1f20f9e48fa2e3b26aaf8875fb959716304e8;hpb=267a39bafd249d7eb9c37df06dc6defcf41cb343;p=gnulib.git

diff --git a/lib/xtime.h b/lib/xtime.h
index 8da1f20f9..1be9ad768 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 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,34 @@
    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.  */
 
 #ifndef XTIME_H_
-#define XTIME_H_ 1
+# define XTIME_H_ 1
 
 /* 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
-#else
-# include <limits.h>
-typedef long int xtime_t;
-# if LONG_MAX >> 31 >> 31 == 0
-#  define XTIME_PRECISION 1L
+#  define XTIME_PRECISION 1000000000
 # else
-#  define XTIME_PRECISION 1000000000L
+#  include <limits.h>
+typedef long int xtime_t;
+#  if LONG_MAX >> 31 >> 31 == 0
+#   define XTIME_PRECISION 1
+#  else
+#   define XTIME_PRECISION 1000000000
+#  endif
 # endif
-#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_make (xtime_t s, long int ns)
 {
   if (XTIME_PRECISION == 1)
     return s;
@@ -68,17 +67,17 @@ xtime_sec (xtime_t t)
 }
 
 /* Return the number of nanoseconds in T, which must be nonnegative.  */
-static inline int
+static inline long int
 xtime_nonnegative_nsec (xtime_t t)
 {
   return t % XTIME_PRECISION;
 }
 
 /* Return the number of nanoseconds in T.  */
-static inline int
+static 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;