From a85d4ade5de20f2ad6fa995ee6c7fddb4bc62ce2 Mon Sep 17 00:00:00 2001
From: Christophe Bedard <fixed-term.christophe.bourquebedard@de.bosch.com>
Date: Tue, 18 Jun 2019 11:44:57 +0200
Subject: [PATCH] Use TRACETOOLS_LTTNG_ENABLED instead of WITH_LTTNG in the
 code

---
 tracetools/CMakeLists.txt   | 2 +-
 tracetools/src/tracetools.c | 4 ++--
 tracetools/src/utils.cpp    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tracetools/CMakeLists.txt b/tracetools/CMakeLists.txt
index e97c8d1..a6327a5 100644
--- a/tracetools/CMakeLists.txt
+++ b/tracetools/CMakeLists.txt
@@ -59,7 +59,7 @@ endif()
 
 add_library(${PROJECT_NAME} ${SOURCES})
 if(TRACING_ENABLED)
-  target_compile_definitions(${PROJECT_NAME} PUBLIC WITH_LTTNG)
+  target_compile_definitions(${PROJECT_NAME} PUBLIC TRACETOOLS_LTTNG_ENABLED)
   target_link_libraries(${PROJECT_NAME} ${LTTNG_LIBRARIES} -ldl)
 else()
   target_link_libraries(${PROJECT_NAME})
diff --git a/tracetools/src/tracetools.c b/tracetools/src/tracetools.c
index 0755f85..fc2b996 100644
--- a/tracetools/src/tracetools.c
+++ b/tracetools/src/tracetools.c
@@ -14,7 +14,7 @@
 
 #include "tracetools/tracetools.h"
 
-#if defined(WITH_LTTNG) && !defined(_WIN32)
+#if defined(TRACETOOLS_LTTNG_ENABLED) && !defined(_WIN32)
 # include "tracetools/tp_call.h"
 # define CONDITIONAL_TP(...) \
   tracepoint(__VA_ARGS__)
@@ -24,7 +24,7 @@
 
 bool ros_trace_compile_status()
 {
-#if defined(WITH_LTTNG) && !defined(_WIN32)
+#if defined(TRACETOOLS_LTTNG_ENABLED) && !defined(_WIN32)
   return true;
 #else
   return false;
diff --git a/tracetools/src/utils.cpp b/tracetools/src/utils.cpp
index 2d48ffa..acb49cb 100644
--- a/tracetools/src/utils.cpp
+++ b/tracetools/src/utils.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#if defined(WITH_LTTNG) && !defined(_WIN32)
+#if defined(TRACETOOLS_LTTNG_ENABLED) && !defined(_WIN32)
 #include <dlfcn.h>
 #include <cxxabi.h>
 #endif
@@ -21,7 +21,7 @@
 const char * get_symbol(void * funptr)
 {
 #define SYMBOL_UNKNOWN "UNKNOWN"
-#if defined(WITH_LTTNG) && !defined(_WIN32)
+#if defined(TRACETOOLS_LTTNG_ENABLED) && !defined(_WIN32)
 #define SYMBOL_LAMBDA "[lambda]"
   if (funptr == 0) {
     return SYMBOL_LAMBDA;