projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests: Introduce test_ust_constructor
[lttng-tools.git]
/
src
/
common
/
compat
/
time.hpp
diff --git
a/src/common/compat/time.hpp
b/src/common/compat/time.hpp
index 37f472a4aad1378d95542fde0f258132b76c368c..aed37ceedbfcd74f36ae4e60c12c000ab69287f2 100644
(file)
--- a/
src/common/compat/time.hpp
+++ b/
src/common/compat/time.hpp
@@
-12,12
+12,15
@@
#ifdef __APPLE__
#ifdef __APPLE__
+#include <cstdint>
+
typedef uint64_t timer_t;
typedef uint64_t timer_t;
-#include <mach/mach.h>
-#include <mach/clock.h>
#include <common/compat/errno.hpp>
#include <common/compat/errno.hpp>
+#include <mach/clock.h>
+#include <mach/mach.h>
+
#undef NSEC_PER_SEC
#undef NSEC_PER_MSEC
#undef NSEC_PER_USEC
#undef NSEC_PER_SEC
#undef NSEC_PER_MSEC
#undef NSEC_PER_USEC
@@
-29,11
+32,10
@@
typedef uint64_t timer_t;
#if defined(__APPLE__) && !defined(LTTNG_HAVE_CLOCK_GETTIME)
typedef int clockid_t;
#if defined(__APPLE__) && !defined(LTTNG_HAVE_CLOCK_GETTIME)
typedef int clockid_t;
-#define CLOCK_REALTIME CALENDAR_CLOCK
+#define CLOCK_REALTIME CALENDAR_CLOCK
#define CLOCK_MONOTONIC SYSTEM_CLOCK
#define CLOCK_MONOTONIC SYSTEM_CLOCK
-static inline
-int lttng_clock_gettime(clockid_t clk_id, struct timespec *tp)
+static inline int lttng_clock_gettime(clockid_t clk_id, struct timespec *tp)
{
int ret = 0;
clock_serv_t clock;
{
int ret = 0;
clock_serv_t clock;
@@
-64,8
+66,7
@@
end:
#else /* __APPLE__ && !LTTNG_HAVE_CLOCK_GETTIME */
#else /* __APPLE__ && !LTTNG_HAVE_CLOCK_GETTIME */
-static inline
-int lttng_clock_gettime(clockid_t clk_id, struct timespec *tp)
+static inline int lttng_clock_gettime(clockid_t clk_id, struct timespec *tp)
{
return clock_gettime(clk_id, tp);
}
{
return clock_gettime(clk_id, tp);
}
This page took
0.024169 seconds
and
4
git commands to generate.