Changing some uses of #ifdef HPX_MSVC to #ifdef WIN32

STEllAR-GROUP · May 16, 2017 · afcd1fa · afcd1fa
1 parent da51f54
commit afcd1fa
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/hpx/config.hpp b/hpx/config.hpp
@@ -43,7 +43,7 @@
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/stringize.hpp>
 
-#if defined(HPX_MSVC)
+#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
 // On Windows, make sure winsock.h is not included even if windows.h is
 // included before winsock2.h
 #define _WINSOCKAPI_

diff --git a/hpx/lcos/local/recursive_mutex.hpp b/hpx/lcos/local/recursive_mutex.hpp
@@ -32,7 +32,7 @@ namespace hpx { namespace lcos { namespace local
 
             static thread_id_type call()
             {
-#if defined(HPX_MSVC) || defined(HPX_INTEL_WIN)
+#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
                 return (thread_id_type)GetCurrentThreadId();
 #else
                 return (thread_id_type)pthread_self();

diff --git a/hpx/util/set_thread_name.hpp b/hpx/util/set_thread_name.hpp
@@ -8,7 +8,7 @@
 
 #include <hpx/config.hpp>
 
-#if defined(HPX_MSVC)
+#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
 #include <windows.h>
 
 namespace hpx { namespace util

diff --git a/src/runtime/threads/topology.cpp b/src/runtime/threads/topology.cpp
@@ -82,7 +82,8 @@ namespace hpx { namespace threads
                 "setpriority returned an error");
             return false;
         }
-#elif defined(HPX_MSVC)
+#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
+
         if (!SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_LOWEST))
         {
             HPX_THROWS_IF(ec, no_success, "threadmanager_impl::tfunc",

diff --git a/src/util/backtrace/backtrace.cpp b/src/util/backtrace/backtrace.cpp
@@ -65,7 +65,6 @@
 #include <dbghelp.h>
 #endif
 
-
 namespace hpx { namespace util {
 
     namespace stack_trace

diff --git a/src/util/set_thread_name.cpp b/src/util/set_thread_name.cpp
@@ -8,7 +8,7 @@
 
 #include <hpx/config.hpp>
 
-#if defined(HPX_MSVC)
+#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
 
 #include <hpx/util/set_thread_name.hpp>