From 9b14815a9ee98c0dbc842a1e545cd6a82ae7b18a Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 22 Apr 2021 12:57:39 -0400
Subject: [PATCH] Prefix public header include guards with LTTNG_UST_

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I00a82a300dfd405bddfd30418236d49160998562
---
 include/lttng/tracepoint-rcu.h      | 6 +++---
 include/lttng/tracepoint-types.h    | 6 +++---
 include/lttng/tracepoint.h          | 6 +++---
 include/lttng/urcu/static/pointer.h | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/include/lttng/tracepoint-rcu.h b/include/lttng/tracepoint-rcu.h
index 28988458..f2d10afa 100644
--- a/include/lttng/tracepoint-rcu.h
+++ b/include/lttng/tracepoint-rcu.h
@@ -4,8 +4,8 @@
  * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#ifndef _LTTNG_TRACEPOINT_RCU_H
-#define _LTTNG_TRACEPOINT_RCU_H
+#ifndef _LTTNG_UST_TRACEPOINT_RCU_H
+#define _LTTNG_UST_TRACEPOINT_RCU_H
 
 #include <urcu/compiler.h>
 #include <lttng/urcu/pointer.h>
@@ -40,4 +40,4 @@
 #define TP_RCU_LINK_TEST	LTTNG_UST_TP_RCU_LINK_TEST
 #endif
 
-#endif	/* _LTTNG_TRACEPOINT_RCU_H */
+#endif	/* _LTTNG_UST_TRACEPOINT_RCU_H */
diff --git a/include/lttng/tracepoint-types.h b/include/lttng/tracepoint-types.h
index d169a112..42fe9486 100644
--- a/include/lttng/tracepoint-types.h
+++ b/include/lttng/tracepoint-types.h
@@ -4,8 +4,8 @@
  * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#ifndef _LTTNG_TRACEPOINT_TYPES_H
-#define _LTTNG_TRACEPOINT_TYPES_H
+#ifndef _LTTNG_UST_TRACEPOINT_TYPES_H
+#define _LTTNG_UST_TRACEPOINT_TYPES_H
 
 #include <stdint.h>
 
@@ -48,4 +48,4 @@ struct lttng_ust_tracepoint {
 	/* End of base ABI. Fields below should be used after checking struct_size. */
 };
 
-#endif /* _LTTNG_TRACEPOINT_TYPES_H */
+#endif /* _LTTNG_UST_TRACEPOINT_TYPES_H */
diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h
index 5863e845..be18e94c 100644
--- a/include/lttng/tracepoint.h
+++ b/include/lttng/tracepoint.h
@@ -4,8 +4,8 @@
  * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#ifndef _LTTNG_TRACEPOINT_H
-#define _LTTNG_TRACEPOINT_H
+#ifndef _LTTNG_UST_TRACEPOINT_H
+#define _LTTNG_UST_TRACEPOINT_H
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -592,7 +592,7 @@ lttng_ust__tracepoints__ptrs_destroy(void)
 }
 #endif
 
-#endif /* _LTTNG_TRACEPOINT_H */
+#endif /* _LTTNG_UST_TRACEPOINT_H */
 
 /* The following declarations must be outside re-inclusion protection. */
 
diff --git a/include/lttng/urcu/static/pointer.h b/include/lttng/urcu/static/pointer.h
index 25658c7a..4ddfc325 100644
--- a/include/lttng/urcu/static/pointer.h
+++ b/include/lttng/urcu/static/pointer.h
@@ -10,8 +10,8 @@
  * RELEASE. See urcu.h for linking dynamically with the userspace rcu library.
  */
 
-#ifndef _LTTNG_URCU_POINTER_STATIC_H
-#define _LTTNG_URCU_POINTER_STATIC_H
+#ifndef _LTTNG_UST_URCU_POINTER_STATIC_H
+#define _LTTNG_UST_URCU_POINTER_STATIC_H
 
 #include <urcu/compiler.h>
 #include <urcu/arch.h>
@@ -127,4 +127,4 @@ extern "C" {
 }
 #endif
 
-#endif /* _LTTNG_URCU_POINTER_STATIC_H */
+#endif /* _LTTNG_UST_URCU_POINTER_STATIC_H */
-- 
2.34.1