From ee0e499d7909c7e235543682e9e7ef8033180f52 Mon Sep 17 00:00:00 2001
From: Evgeni Raikhel <evgeni.raikhel@intel.com>
Date: Mon, 26 Aug 2019 17:47:58 +0300
Subject: [PATCH] Fix gcc32bit compilation. Push BUILD_INTERNAL_UNIT_TESTS to
 the precompiler definitions Minor adjustments

---
 CMake/global_config.cmake                    | 4 ++++
 common/tiny-profiler.h                       | 1 +
 unit-tests/internal/CMakeLists.txt           | 2 +-
 unit-tests/internal/internal-tests-types.cpp | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CMake/global_config.cmake b/CMake/global_config.cmake
index 9025227b2c7..bb81220203a 100644
--- a/CMake/global_config.cmake
+++ b/CMake/global_config.cmake
@@ -53,6 +53,10 @@ macro(global_set_flags)
         add_definitions(-DRS2_USE_CUDA)
     endif()
 
+    if (BUILD_INTERNAL_UNIT_TESTS)
+        add_definitions(-DBUILD_INTERNAL_UNIT_TESTS)
+    endif()
+
     if(FORCE_LIBUVC)
         set(BACKEND RS2_USE_LIBUVC_BACKEND)
         message(STATUS "Using libuvc (by force)")
diff --git a/common/tiny-profiler.h b/common/tiny-profiler.h
index 44b23fc227c..ad0f4179c83 100644
--- a/common/tiny-profiler.h
+++ b/common/tiny-profiler.h
@@ -3,6 +3,7 @@
 #include <unordered_map>
 #include <chrono>
 #include <iostream>
+#include <cstring> // strlen
 
 class scoped_timer
 {
diff --git a/unit-tests/internal/CMakeLists.txt b/unit-tests/internal/CMakeLists.txt
index b5b562f7b65..fdebdf8c301 100644
--- a/unit-tests/internal/CMakeLists.txt
+++ b/unit-tests/internal/CMakeLists.txt
@@ -9,7 +9,7 @@ set (INTERNAL_TESTS_SOURCES
     internal-tests-main.cpp
     internal-tests-usb.cpp
     internal-tests-extrinsic.cpp
-	internal-tests-types.cpp
+    internal-tests-types.cpp
 )
 
 add_executable(${PROJECT_NAME} ${INTERNAL_TESTS_SOURCES})
diff --git a/unit-tests/internal/internal-tests-types.cpp b/unit-tests/internal/internal-tests-types.cpp
index 71ee8043640..917b47205d6 100644
--- a/unit-tests/internal/internal-tests-types.cpp
+++ b/unit-tests/internal/internal-tests-types.cpp
@@ -1,5 +1,5 @@
 // License: Apache 2.0. See LICENSE file in root directory.
-// Copyright(c) 2015 Intel Corporation. All Rights Reserved.
+// Copyright(c) 2019 Intel Corporation. All Rights Reserved.
 
 #include "catch/catch.hpp"
 #include <cmath>