projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
acl: allow cross-compilation to Gentoo
[gnulib.git]
/
lib
/
gethrxtime.c
diff --git
a/lib/gethrxtime.c
b/lib/gethrxtime.c
index
8436746
..
10d2ab9
100644
(file)
--- a/
lib/gethrxtime.c
+++ b/
lib/gethrxtime.c
@@
-1,6
+1,6
@@
/* gethrxtime -- get high resolution real time
/* gethrxtime -- get high resolution real time
- Copyright (C) 2005
, 2006, 2007, 2009, 2010
Free Software Foundation, Inc.
+ Copyright (C) 2005
-2007, 2009-2013
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
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
@@
-19,8
+19,11
@@
#include <config.h>
#include <config.h>
+#define GETHRXTIME_INLINE _GL_EXTERN_INLINE
#include "gethrxtime.h"
#include "gethrxtime.h"
+#if ! (HAVE_ARITHMETIC_HRTIME_T && HAVE_DECL_GETHRTIME)
+
#include <sys/time.h>
#include "timespec.h"
#include <sys/time.h>
#include "timespec.h"
@@
-32,30
+35,30
@@
xtime_t
gethrxtime (void)
{
xtime_t
gethrxtime (void)
{
-#if HAVE_NANOUPTIME
+#
if HAVE_NANOUPTIME
{
struct timespec ts;
nanouptime (&ts);
return xtime_make (ts.tv_sec, ts.tv_nsec);
}
{
struct timespec ts;
nanouptime (&ts);
return xtime_make (ts.tv_sec, ts.tv_nsec);
}
-#else
+#
else
-# if defined CLOCK_MONOTONIC && HAVE_CLOCK_GETTIME
+#
if defined CLOCK_MONOTONIC && HAVE_CLOCK_GETTIME
{
struct timespec ts;
if (clock_gettime (CLOCK_MONOTONIC, &ts) == 0)
return xtime_make (ts.tv_sec, ts.tv_nsec);
}
{
struct timespec ts;
if (clock_gettime (CLOCK_MONOTONIC, &ts) == 0)
return xtime_make (ts.tv_sec, ts.tv_nsec);
}
-# endif
+#
endif
-# if HAVE_MICROUPTIME
+#
if HAVE_MICROUPTIME
{
struct timeval tv;
microuptime (&tv);
return xtime_make (tv.tv_sec, 1000 * tv.tv_usec);
}
{
struct timeval tv;
microuptime (&tv);
return xtime_make (tv.tv_sec, 1000 * tv.tv_usec);
}
-# else
+#
else
/* No monotonically increasing clocks are available; fall back on a
clock that might jump backwards, since it's the best we can do. */
{
/* No monotonically increasing clocks are available; fall back on a
clock that might jump backwards, since it's the best we can do. */
{
@@
-63,6
+66,8
@@
gethrxtime (void)
gettime (&ts);
return xtime_make (ts.tv_sec, ts.tv_nsec);
}
gettime (&ts);
return xtime_make (ts.tv_sec, ts.tv_nsec);
}
+# endif
# endif
# endif
-#endif
}
}
+
+#endif