-
Notifications
You must be signed in to change notification settings - Fork 6.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[poco] Fix mingw compilation (#42330)
- Loading branch information
1 parent
2bf7865
commit 242ad16
Showing
5 changed files
with
47 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt | ||
index 41ba99936..b3986690f 100644 | ||
--- a/Foundation/CMakeLists.txt | ||
+++ b/Foundation/CMakeLists.txt | ||
@@ -189,7 +189,6 @@ if(MINGW) | ||
_WIN32 | ||
MINGW32 | ||
WINVER=0x500 | ||
- ODBCVER=0x0300 | ||
POCO_THREAD_STACK_SIZE | ||
) | ||
endif() | ||
diff --git a/Foundation/include/Poco/Platform.h b/Foundation/include/Poco/Platform.h | ||
index 7a4e7e2fb..8caa6de06 100644 | ||
--- a/Foundation/include/Poco/Platform.h | ||
+++ b/Foundation/include/Poco/Platform.h | ||
@@ -244,6 +244,9 @@ | ||
#define POCO_NO_FPENVIRONMENT | ||
#endif | ||
|
||
+#if defined (__MINGW32__) || defined (__MINGW64__) | ||
+ #define POCO_COMPILER_MINGW | ||
+#endif | ||
|
||
#if defined(__clang__) | ||
#define POCO_COMPILER_CLANG | ||
@@ -253,11 +256,6 @@ | ||
#elif defined (__GNUC__) | ||
#define POCO_COMPILER_GCC | ||
#define POCO_HAVE_CXXABI_H | ||
- #if defined (__MINGW32__) || defined (__MINGW64__) | ||
- #define POCO_COMPILER_MINGW | ||
- #endif | ||
-#elif defined (__MINGW32__) || defined (__MINGW64__) | ||
- #define POCO_COMPILER_MINGW | ||
#elif defined (__INTEL_COMPILER) || defined(__ICC) || defined(__ECC) || defined(__ICL) | ||
#define POCO_COMPILER_INTEL | ||
#elif defined (__SUNPRO_CC) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters