fix: redundant decl of channel_destroy (-Wredundant-decls)

[lttng-ust.git] / liblttng-ust / clock.h

diff --git a/liblttng-ust/clock.h b/liblttng-ust/clock.h
index d5548e90e4fe9a301f06fd6dc86ad400c80ff091..824df431f408d881e85d98990e0b98337ed98bff 100644 (file)
--- a/liblttng-ust/clock.h
+++ b/liblttng-ust/clock.h
@@ -1,20 +1,8 @@
 /*
- * Copyright (C) 2010  Pierre-Marc Fournier
- * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * 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; version 2.1 of
- * the License.
- *
- * 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
+ * Copyright (C) 2010 Pierre-Marc Fournier
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
 #ifndef _UST_CLOCK_H
@@ -31,7 +19,7 @@
 
 #include "lttng-ust-uuid.h"
 
-struct lttng_trace_clock {
+struct lttng_ust_trace_clock {
        uint64_t (*read64)(void);
        uint64_t (*freq)(void);
        int (*uuid)(char *uuid);
@@ -39,7 +27,8 @@ struct lttng_trace_clock {
        const char *(*description)(void);
 };
 
-extern struct lttng_trace_clock *lttng_trace_clock;
+__attribute__((visibility("hidden")))
+extern struct lttng_ust_trace_clock *lttng_ust_trace_clock;
 
 void lttng_ust_clock_init(void);
 
@@ -60,7 +49,7 @@ uint64_t trace_clock_read64_monotonic(void)
 static __inline__
 uint64_t trace_clock_read64(void)
 {
-       struct lttng_trace_clock *ltc = CMM_LOAD_SHARED(lttng_trace_clock);
+       struct lttng_ust_trace_clock *ltc = CMM_LOAD_SHARED(lttng_ust_trace_clock);
 
        if (caa_likely(!ltc)) {
                return trace_clock_read64_monotonic();