diff options
| author | Patrick Storz <eduard.braun2@gmx.de> | 2019-06-09 00:34:06 +0000 |
|---|---|---|
| committer | Patrick Storz <eduard.braun2@gmx.de> | 2019-06-09 00:34:06 +0000 |
| commit | 2b4b777418d9cdf03dcc4e5cf3a1e2ab2c274769 (patch) | |
| tree | 6f96e9503ac24bdf09867c74964d501e28a4707a /src | |
| parent | rsync with last merge in 2Geom (diff) | |
| download | inkscape-2b4b777418d9cdf03dcc4e5cf3a1e2ab2c274769.tar.gz inkscape-2b4b777418d9cdf03dcc4e5cf3a1e2ab2c274769.zip | |
Minor cleanup (remove unneeded win32-specific defines)
Diffstat (limited to 'src')
| -rw-r--r-- | src/object/color-profile.cpp | 3 | ||||
| -rw-r--r-- | src/ui/dialog/filedialogimpl-win32.h | 5 | ||||
| -rw-r--r-- | src/winconsole.cpp | 1 |
3 files changed, 1 insertions, 8 deletions
diff --git a/src/object/color-profile.cpp b/src/object/color-profile.cpp index 36bb32142..cdfea4bad 100644 --- a/src/object/color-profile.cpp +++ b/src/object/color-profile.cpp @@ -30,9 +30,6 @@ #include <io/resource.h> #ifdef _WIN32 -#ifndef _WIN32_WINDOWS // Allow use of features specific to Windows 98 or later. Required for correctly including icm.h -#define _WIN32_WINDOWS 0x0410 -#endif #include <windows.h> #endif diff --git a/src/ui/dialog/filedialogimpl-win32.h b/src/ui/dialog/filedialogimpl-win32.h index a086962b7..9dedaa30c 100644 --- a/src/ui/dialog/filedialogimpl-win32.h +++ b/src/ui/dialog/filedialogimpl-win32.h @@ -18,10 +18,7 @@ #include "filedialogimpl-gtkmm.h" #include "inkgc/gc-core.h" -// define WINVER high enough so we get the correct OPENFILENAMEW size -#ifndef WINVER -#define WINVER 0x0500 -#endif + #include <windows.h> diff --git a/src/winconsole.cpp b/src/winconsole.cpp index aa04128fd..398608e78 100644 --- a/src/winconsole.cpp +++ b/src/winconsole.cpp @@ -40,7 +40,6 @@ */ #ifdef _WIN32 -#undef DATADIR #include <windows.h> struct echo_thread_info { |