diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2018-09-30 21:47:39 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2018-10-01 22:50:12 +0000 |
| commit | 172dbd2b94199731c1bbd2f789e55535188ade5c (patch) | |
| tree | 907ca31a726661673f72eb35c2a8431e0dc57873 /src/object | |
| parent | config.h - remove all defines we never use (diff) | |
| download | inkscape-172dbd2b94199731c1bbd2f789e55535188ade5c.tar.gz inkscape-172dbd2b94199731c1bbd2f789e55535188ade5c.zip | |
Use _WIN32 instead of WIN32
The former is guaranteed to be set for any compiler targeting win32,
the latter is implementation dependent (but works for gcc)
See also
http://nadeausoftware.com/articles/2012/01/c_c_tip_how_use_compiler_predefined_macros_detect_operating_system
Diffstat (limited to 'src/object')
| -rw-r--r-- | src/object/color-profile.cpp | 10 | ||||
| -rw-r--r-- | src/object/sp-namedview.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/object/color-profile.cpp b/src/object/color-profile.cpp index 38064022a..f010efe33 100644 --- a/src/object/color-profile.cpp +++ b/src/object/color-profile.cpp @@ -20,7 +20,7 @@ #include <io/sys.h> #include <io/resource.h> -#ifdef WIN32 +#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 @@ -46,9 +46,9 @@ #include <glibmm/convert.h> #include "uri.h" -#ifdef WIN32 +#ifdef _WIN32 #include <icm.h> -#endif // WIN32 +#endif // _WIN32 using Inkscape::ColorProfile; using Inkscape::ColorProfileImpl; @@ -788,7 +788,7 @@ std::set<ColorProfile::FilePlusHome> ColorProfile::getBaseProfileDirs() { g_free(path); } -#ifdef WIN32 +#ifdef _WIN32 wchar_t pathBuf[MAX_PATH + 1]; pathBuf[0] = 0; DWORD pathSize = sizeof(pathBuf); @@ -802,7 +802,7 @@ std::set<ColorProfile::FilePlusHome> ColorProfile::getBaseProfileDirs() { } g_free( utf8Path ); } -#endif // WIN32 +#endif // _WIN32 return sources; } diff --git a/src/object/sp-namedview.cpp b/src/object/sp-namedview.cpp index b6f7d7373..0618485d2 100644 --- a/src/object/sp-namedview.cpp +++ b/src/object/sp-namedview.cpp @@ -785,7 +785,7 @@ void sp_namedview_window_from_document(SPDesktop *desktop) } } if ((w > 0) && (h > 0)) { -#ifndef WIN32 +#ifndef _WIN32 gint dx= 0; gint dy = 0; gint dw = 0; |