From 264fa6709a5572e877b9e7c3f7b8d43ef8d75594 Mon Sep 17 00:00:00 2001 From: Dan Rose Date: Fri, 11 Sep 2020 09:57:26 -0500 Subject: [PATCH] Change `WIN32` to `_WIN32` (#53) This seems to have been a typo. The correct macro is `_WIN32` as seen elsewhere in this repo and as per the docs: https://docs.microsoft.com/en-us/cpp/preprocessor/predefined-macros?view=vs-2019 Possibly responsible for https://github.com/ros-tooling/setup-ros/issues/236 --- .../src/test_runner/execute_process.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/osrf_testing_tools_cpp/src/test_runner/execute_process.hpp b/osrf_testing_tools_cpp/src/test_runner/execute_process.hpp index 8bb4d9f..1a7a586 100644 --- a/osrf_testing_tools_cpp/src/test_runner/execute_process.hpp +++ b/osrf_testing_tools_cpp/src/test_runner/execute_process.hpp @@ -21,7 +21,7 @@ #include #include -#if defined(WIN32) +#if defined(_WIN32) #include #else #include @@ -35,7 +35,7 @@ namespace test_runner namespace impl { -#if defined(WIN32) +#if defined(_WIN32) int execute_process_win32(const std::vector & commands); #else int execute_process_unix(const std::vector & commands); @@ -47,14 +47,14 @@ int execute_process_unix(const std::vector & commands); int execute_process(const std::vector & commands) { -#if defined(WIN32) +#if defined(_WIN32) return impl::execute_process_win32(commands); #else return impl::execute_process_unix(commands); #endif } -#if defined(WIN32) +#if defined(_WIN32) int impl::execute_process_win32(const std::vector & commands) {