Experimental MinGW support preparation: shared

More strict windows preprocessor definitions MinGW threading model detection
cmangos · May 14, 2017 · 8e58d23 · 8e58d23
1 parent 0cff75e
commit 8e58d23
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/src/shared/Database/DatabaseMysql.cpp b/src/shared/Database/DatabaseMysql.cpp
@@ -105,7 +105,7 @@ bool MySQLConnection::Initialize(const char* infoString)
         database = *iter++;
 
     mysql_options(mysqlInit, MYSQL_SET_CHARSET_NAME, "utf8");
-#ifdef WIN32
+#ifdef _WIN32
     if (host == ".")                                        // named pipe use option (Windows)
     {
         unsigned int opt = MYSQL_PROTOCOL_PIPE;

diff --git a/src/shared/Database/DatabaseMysql.h b/src/shared/Database/DatabaseMysql.h
@@ -25,7 +25,7 @@
 #include "Database.h"
 #include "Policies/Singleton.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <mysql/mysql.h>
 #else
 #include <mysql.h>

diff --git a/src/shared/Database/DatabasePostgre.h b/src/shared/Database/DatabasePostgre.h
@@ -26,7 +26,7 @@
 #include "ace/Guard_T.h"
 #include <stdarg.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #define FD_SETSIZE 1024
 #include <winsock2.h>
 #include <postgre/libpq-fe.h>

diff --git a/src/shared/Database/QueryResultMysql.h b/src/shared/Database/QueryResultMysql.h
@@ -23,7 +23,7 @@
 
 #include "Common.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <WinSock2.h>
 #include <mysql/mysql.h>
 #else

diff --git a/src/shared/Database/QueryResultPostgre.h b/src/shared/Database/QueryResultPostgre.h
@@ -19,7 +19,7 @@
 #if !defined(QUERYRESULTPOSTGRE_H)
 #define QUERYRESULTPOSTGRE_H
 
-#ifdef WIN32
+#ifdef _WIN32
 #define FD_SETSIZE 1024
 #include <winsock2.h>
 #include <postgre/libpq-fe.h>

diff --git a/src/shared/ServiceWin32.cpp b/src/shared/ServiceWin32.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifdef WIN32
+#ifdef _WIN32
 
 #include "Common.h"
 #include "Log.h"

diff --git a/src/shared/ServiceWin32.h b/src/shared/ServiceWin32.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifdef WIN32
+#ifdef _WIN32
 #ifndef _WIN32_SERVICE_
 #define _WIN32_SERVICE_
 

diff --git a/src/shared/Threading.cpp b/src/shared/Threading.cpp
@@ -93,7 +93,7 @@ void Thread::setPriority(Priority priority)
 {
     std::thread::native_handle_type handle = m_ThreadImp.native_handle();
     bool _ok = true;
-#ifdef WIN32
+#if defined(_WIN32) && !defined(__WINPTHREADS_VERSION)
 
     switch (priority)
     {
@@ -134,4 +134,4 @@ void Thread::setPriority(Priority priority)
 void Thread::Sleep(unsigned long msecs)
 {
     std::this_thread::sleep_for(std::chrono::milliseconds(msecs));
-}
+}
diff --git a/src/shared/Util.cpp b/src/shared/Util.cpp
@@ -286,7 +286,7 @@ uint32 CreatePIDFile(const std::string& filename)
     if (pid_file == nullptr)
         return 0;
 
-#ifdef WIN32
+#ifdef _WIN32
     DWORD pid = GetCurrentProcessId();
 #else
     pid_t pid = getpid();