New modules unistr/u*-mbsnlen.

[gnulib.git] / lib / xtime.h

diff --git a/lib/xtime.h b/lib/xtime.h
index 1d5f70b..d268d2d 100644 (file)
--- 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,23 +25,23 @@
    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
 
 /* 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;