Checking MSVC predefined macro. (#45)

ros · Aug 6, 2020 · 4fd1671 · 4fd1671
1 parent b2e2b98
commit 4fd1671
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/include/ros/assert.h b/include/ros/assert.h
@@ -91,12 +91,10 @@
 
 #include <ros/platform.h>
 
-#ifdef WIN32
-# if defined (__MINGW32__)
-#  define ROS_ISSUE_BREAK() DebugBreak();
-# else // MSVC
-#  define ROS_ISSUE_BREAK() __debugbreak();
-# endif
+#if defined(__MINGW32__)
+# define ROS_ISSUE_BREAK() DebugBreak();
+#elif defined(_MSC_VER)
+# define ROS_ISSUE_BREAK() __debugbreak();
 #elif defined(__powerpc64__)
 # define ROS_ISSUE_BREAK() asm volatile ("tw 31,1,1");
 #elif defined(__i386__) || defined(__ia64__) || defined(__x86_64__)

diff --git a/include/ros/console.h b/include/ros/console.h
@@ -273,15 +273,15 @@ ROSCONSOLE_DECL std::string formatToString(const char* fmt, ...);
 } // namespace console
 } // namespace ros
 
-#ifdef WIN32
+#if defined(_MSC_VER)
 #define ROS_LIKELY(x)       (x)
 #define ROS_UNLIKELY(x)     (x)
 #else
 #define ROS_LIKELY(x)       __builtin_expect((x),1)
 #define ROS_UNLIKELY(x)     __builtin_expect((x),0)
 #endif
 
-#if defined(MSVC)
+#if defined(_MSC_VER)
   #define __ROSCONSOLE_FUNCTION__ __FUNCSIG__
 #elif defined(__GNUC__)
   #define __ROSCONSOLE_FUNCTION__ __PRETTY_FUNCTION__

diff --git a/src/rosconsole/rosconsole.cpp b/src/rosconsole/rosconsole.cpp
@@ -72,7 +72,7 @@ log4cxx::LevelPtr g_level_lookup[levels::Count] =
 #endif
 std::string g_last_error_message = "Unknown Error";
 
-#ifdef WIN32
+#ifdef _WIN32
   #define COLOR_NORMAL ""
   #define COLOR_RED ""
   #define COLOR_GREEN ""