Skip to content

Commit

Permalink
Change WIN32 to _WIN32 (#53)
Browse files Browse the repository at this point in the history
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 ros-tooling/setup-ros#236
  • Loading branch information
rotu authored Sep 11, 2020
1 parent df807c0 commit 264fa67
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions osrf_testing_tools_cpp/src/test_runner/execute_process.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <string>
#include <vector>

#if defined(WIN32)
#if defined(_WIN32)
#include <Windows.h>
#else
#include <sys/types.h>
Expand All @@ -35,7 +35,7 @@ namespace test_runner
namespace impl
{

#if defined(WIN32)
#if defined(_WIN32)
int execute_process_win32(const std::vector<std::string> & commands);
#else
int execute_process_unix(const std::vector<std::string> & commands);
Expand All @@ -47,14 +47,14 @@ int execute_process_unix(const std::vector<std::string> & commands);
int
execute_process(const std::vector<std::string> & 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<std::string> & commands)
{
Expand Down

0 comments on commit 264fa67

Please sign in to comment.