X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxtime.h;h=1be9ad7681828477d8545da09e665baa1426fb6a;hb=6cad9c91215eac0f90bbb1f9473ea0f5fce3b085;hp=333f895b690ce35772f893ca65b24e5e3e4f1a7d;hpb=10ce26c08f4e8ffe6ac636b1fec6a33a847b0d3a;p=gnulib.git
diff --git a/lib/xtime.h b/lib/xtime.h
index 333f895b6..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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
/* 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
-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
+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;