From ff9f6e8a490fed722095b7fc6cbfc98816bf09a5 Mon Sep 17 00:00:00 2001
From: Christophe Bedard <fixed-term.christophe.bourquebedard@de.bosch.com>
Date: Fri, 5 Jul 2019 09:02:44 +0200
Subject: [PATCH] Remove preprocessor checks for WIN32

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

diff --git a/tracetools/src/tracetools.c b/tracetools/src/tracetools.c
index fc2b996..1509761 100644
--- a/tracetools/src/tracetools.c
+++ b/tracetools/src/tracetools.c
@@ -14,7 +14,7 @@
 
 #include "tracetools/tracetools.h"
 
-#if defined(TRACETOOLS_LTTNG_ENABLED) && !defined(_WIN32)
+#if defined(TRACETOOLS_LTTNG_ENABLED)
 # include "tracetools/tp_call.h"
 # define CONDITIONAL_TP(...) \
   tracepoint(__VA_ARGS__)
@@ -24,7 +24,7 @@
 
 bool ros_trace_compile_status()
 {
-#if defined(TRACETOOLS_LTTNG_ENABLED) && !defined(_WIN32)
+#if defined(TRACETOOLS_LTTNG_ENABLED)
   return true;
 #else
   return false;
diff --git a/tracetools/src/utils.cpp b/tracetools/src/utils.cpp
index 807fe87..352f0a2 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(TRACETOOLS_LTTNG_ENABLED) && !defined(_WIN32)
+#if defined(TRACETOOLS_LTTNG_ENABLED)
 #include <dlfcn.h>
 #include <cxxabi.h>
 #endif
@@ -20,7 +20,7 @@
 
 const char * _demangle_symbol(const char * mangled)
 {
-#if defined(TRACETOOLS_LTTNG_ENABLED) && !defined(_WIN32)
+#if defined(TRACETOOLS_LTTNG_ENABLED)
   char * demangled = nullptr;
   int status;
   demangled = abi::__cxa_demangle(mangled, NULL, 0, &status);
@@ -35,7 +35,7 @@ const char * _demangle_symbol(const char * mangled)
 
 const char * _get_symbol_funcptr(void * funcptr)
 {
-#if defined(TRACETOOLS_LTTNG_ENABLED) && !defined(_WIN32)
+#if defined(TRACETOOLS_LTTNG_ENABLED)
   Dl_info info;
   if (dladdr(funcptr, &info) == 0) {
     return SYMBOL_UNKNOWN;