From 172dbd2b94199731c1bbd2f789e55535188ade5c Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Sun, 30 Sep 2018 23:47:39 +0200 Subject: 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 --- src/libnrtype/FontFactory.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libnrtype') 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); -- cgit v1.2.3