Fix: time redefinition warnings on macOS builds

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/bin/lttng-sessiond/ust-metadata.c b/src/bin/lttng-sessiond/ust-metadata.c
index 49edb1711254bf9475ddc74f9432aec0e0a38312..c1a80c746847a3161f28c143c487f5ccfcde194f 100644 (file)
--- a/src/bin/lttng-sessiond/ust-metadata.c
+++ b/src/bin/lttng-sessiond/ust-metadata.c
@@ -28,6 +28,7 @@
 #include <unistd.h>
 #include <inttypes.h>
 #include <common/common.h>
+#include <common/time.h>
 
 #include "ust-registry.h"
 #include "ust-clock.h"
@@ -37,7 +38,6 @@
 #define max_t(type, a, b)      ((type) ((a) > (b) ? (a) : (b)))
 #endif
 
-#define NSEC_PER_SEC                   1000000000ULL
 #define NR_CLOCK_OFFSET_SAMPLES                10
 
 struct offset_sample {

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index e63ddeb73668f7a3cb6bb26a25e9d372b5b1ce36..8619b5e25f31b627db462a128286ceb0a7872bd9 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -61,7 +61,7 @@ AM_CFLAGS = -fno-strict-aliasing
 
 noinst_HEADERS = lttng-kernel.h defaults.h macros.h error.h futex.h \
                                 uri.h utils.h lttng-kernel-old.h \
-                                align.h bitfield.h bug.h
+                                align.h bitfield.h bug.h time.h
 
 # Common library
 noinst_LTLIBRARIES = libcommon.la

diff --git a/src/common/compat/time.h b/src/common/compat/time.h
index f51075dc39c3e35a3ebd13ad0fc9b61b0bb2a7e4..c8d5859ff9ef22ea8b48c5d3429752342ed89120 100644 (file)
--- a/src/common/compat/time.h
+++ b/src/common/compat/time.h
@@ -32,6 +32,10 @@ typedef int clockid_t;
 #include <mach/mach.h>
 #include <mach/clock.h>
 
+#undef NSEC_PER_SEC
+#undef NSEC_PER_MSEC
+#undef NSEC_PER_USEC
+
 #define CLOCK_REALTIME CALENDAR_CLOCK
 #define CLOCK_MONOTONIC SYSTEM_CLOCK
 

diff --git a/src/common/sessiond-comm/inet.c b/src/common/sessiond-comm/inet.c
index 84bee5bd99142970ece0b1e1a1e9c2a0be10c720..25dbd2195a9f936721fc158a7c94d29234d9206c 100644 (file)
--- a/src/common/sessiond-comm/inet.c
+++ b/src/common/sessiond-comm/inet.c
@@ -30,11 +30,10 @@
 #include <poll.h>
 
 #include <common/common.h>
+#include <common/time.h>
 
 #include "inet.h"
 
-#define MSEC_PER_SEC   1000
-#define NSEC_PER_MSEC  1000000
 #define RECONNECT_DELAY        200     /* ms */
 
 /*

diff --git a/src/common/sessiond-comm/inet6.c b/src/common/sessiond-comm/inet6.c
index 1413c35172a32bfda2293bbe8aae6fd8acba6c1a..0b0383cdd524f77c7749d93aad2c5643937009ae 100644 (file)
--- a/src/common/sessiond-comm/inet6.c
+++ b/src/common/sessiond-comm/inet6.c
@@ -30,11 +30,10 @@
 #include <poll.h>
 
 #include <common/common.h>
+#include <common/time.h>
 
 #include "inet6.h"
 
-#define MSEC_PER_SEC   1000
-#define NSEC_PER_MSEC  1000000
 #define RECONNECT_DELAY        200     /* ms */
 
 /*

diff --git a/src/common/time.h b/src/common/time.h
new file mode 100644 (file)
index 0000000..8177077
--- /dev/null
+++ b/src/common/time.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2016 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#ifndef LTTNG_TIME_H
+#define LTTNG_TIME_H
+
+#define MSEC_PER_SEC   1000ULL
+#define NSEC_PER_SEC   1000000000ULL
+#define NSEC_PER_MSEC  1000000ULL
+#define NSEC_PER_USEC  1000ULL
+
+#endif /* LTTNG_TIME_H */

diff --git a/tests/utils/utils.c b/tests/utils/utils.c
index 7aa8667d4f4520891d4b5d013ae752641897dde8..b85f027e0b41364f5795dcf328710e33c9b16c6f 100644 (file)
--- a/tests/utils/utils.c
+++ b/tests/utils/utils.c
@@ -17,14 +17,12 @@
 
 #include <stdint.h>
 #include <common/compat/time.h>
+#include <common/time.h>
 #include <assert.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <errno.h>
 
-#define NSEC_PER_SEC 1000000000ULL
-#define NSEC_PER_USEC 1000ULL
-
 static inline
 int64_t elapsed_time_ns(struct timespec *t1, struct timespec *t2)
 {