X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxtime.h;h=d268d2d2e514ca92a00a5f766f180c85d3147cec;hb=fa662f811f9a6dda54f64639b107b1637c3ba2e5;hp=3c7f620dbe964a15e2d3b5e6f576b323ab1bf7dc;hpb=c0849d13dad0b2a5fe72b2fb5d480a0822b8819b;p=gnulib.git

diff --git a/lib/xtime.h b/lib/xtime.h
index 3c7f620db..d268d2d2e 100644
--- a/lib/xtime.h
+++ b/lib/xtime.h
@@ -1,6 +1,6 @@
 /* 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
    it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
    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 1000000000
 # else
@@ -41,7 +41,7 @@ typedef long int xtime_t;
 /* 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 +68,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;