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/libnrtype | |
| 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/libnrtype')
| -rw-r--r-- | src/libnrtype/FontFactory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp index 0c2c55f75..964544077 100644 --- a/src/libnrtype/FontFactory.cpp +++ b/src/libnrtype/FontFactory.cpp @@ -791,7 +791,7 @@ void font_factory::AddFontsDir(char const *utf8dir) } gchar *dir; -# ifdef WIN32 +# ifdef _WIN32 dir = g_win32_locale_filename_from_utf8(utf8dir); # else dir = g_filename_from_utf8(utf8dir, -1, nullptr, nullptr, nullptr); @@ -823,7 +823,7 @@ void font_factory::AddFontFile(char const *utf8file) } gchar *file; -# ifdef WIN32 +# ifdef _WIN32 file = g_win32_locale_filename_from_utf8(utf8file); # else file = g_filename_from_utf8(utf8file, -1, nullptr, nullptr, nullptr); |