generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-26 10:32:56 +01:00
Code Issues Projects Releases Wiki Activity

Add a new constant to avoid including <windows.h> on Linux

Browse Source
This commit is contained in:
Francis ANDRE
2017-03-23 17:14:57 +01:00
parent fcbb557a44
commit 42ae8f60b8
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Foundation/include/Poco/UnWindows.h
View File

@@ -80,16 +80,15 @@
#endif #endif
#endif #endif
#if !defined(POCO_NO_WINDOWS_H)
#include <windows.h>
#endif
// To prevent Platform_WIN32.h to modify version defines, // To prevent Platform_WIN32.h to modify version defines,
// uncomment this, otherwise versions will be automatically // uncomment this, otherwise versions will be automatically
// discovered in Platform_WIN32.h. // discovered in Platform_WIN32.h.
// #define POCO_FORCE_MIN_WINDOWS_OS_SUPPORT // #define POCO_FORCE_MIN_WINDOWS_OS_SUPPORT
#include <windows.h>
#if !defined(POCO_NO_UNWINDOWS) #if !defined(POCO_NO_UNWINDOWS)
// A list of annoying macros to #undef. // A list of annoying macros to #undef.
// Extend as required. // Extend as required.

2
PocoDoc/cfg/mkdoc-poco.xml
View File

@@ -49,10 +49,12 @@
${Includes}, ${Includes},
-I/usr/local/mysql/include, -I/usr/local/mysql/include,
-I/usr/include/mysql, -I/usr/include/mysql,
-I/usr/include/postgresql,
-D_DEBUG, -D_DEBUG,
-E, -E,
-C, -C,
-DPOCO_NO_GCC_API_ATTRIBUTE -DPOCO_NO_GCC_API_ATTRIBUTE
-DPOCO_NO_WINDOWS_H
</options> </options>
<path></path> <path></path>
<usePipe>true</usePipe> <usePipe>true</usePipe>

2
PocoDoc/cfg/mkdocumentation.xml
View File

@@ -46,10 +46,12 @@
${Includes}, ${Includes},
-I/usr/local/mysql/include, -I/usr/local/mysql/include,
-I/usr/include/mysql, -I/usr/include/mysql,
-I/usr/include/postgresql,
-D_DEBUG, -D_DEBUG,
-E, -E,
-C, -C,
-DPOCO_NO_GCC_API_ATTRIBUTE -DPOCO_NO_GCC_API_ATTRIBUTE
-DPOCO_NO_WINDOWS_H
</options> </options>
<path></path> <path></path>
<usePipe>true</usePipe> <usePipe>true</usePipe>