diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2014-03-23 17:35:36 +0000 |
|---|---|---|
| committer | Johan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl> | 2014-03-23 17:35:36 +0000 |
| commit | d8bca572c833841866ac4fd1cf1aef139a9b9fc0 (patch) | |
| tree | 3481e4abfe4e780a5401840819da204ff2b07d60 /src | |
| parent | emf-print.cpp : fix coding... :'( (diff) | |
| download | inkscape-d8bca572c833841866ac4fd1cf1aef139a9b9fc0.tar.gz inkscape-d8bca572c833841866ac4fd1cf1aef139a9b9fc0.zip | |
fix Windows build for newer gcc/libs
(bzr r13190)
Diffstat (limited to 'src')
| -rw-r--r-- | src/inkscape.cpp | 5 | ||||
| -rw-r--r-- | src/winmain.cpp | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/inkscape.cpp b/src/inkscape.cpp index 8c4ba5695..54451aba4 100644 --- a/src/inkscape.cpp +++ b/src/inkscape.cpp @@ -32,7 +32,10 @@ # define HAS_PROC_SELF_EXE //to get path of executable #else -#define _WIN32_IE 0x0400 +#if !defined(_WIN32_IE) || (_WIN32_IE < 0x0400) +# undef _WIN32_IE +# define _WIN32_IE 0x0400 +#endif //#define HAS_SHGetSpecialFolderPath #define HAS_SHGetSpecialFolderLocation #define HAS_GetModuleFileName diff --git a/src/winmain.cpp b/src/winmain.cpp index 607660740..5120e44e0 100644 --- a/src/winmain.cpp +++ b/src/winmain.cpp @@ -11,7 +11,12 @@ #include <stdio.h> #include <io.h> #include <conio.h> -#define _WIN32_WINNT 0x0501 + +#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0501) +# undef _WIN32_WINNT +# define _WIN32_WINNT 0x0501 +#endif + #include <windows.h> extern int main (int argc, char **argv); |