summaryrefslogtreecommitdiffstats
path: root/src/helper
diff options
context:
space:
mode:
authorEduard Braun <eduard.braun2@gmx.de>2018-09-30 21:47:39 +0000
committerEduard Braun <eduard.braun2@gmx.de>2018-10-01 22:50:12 +0000
commit172dbd2b94199731c1bbd2f789e55535188ade5c (patch)
tree907ca31a726661673f72eb35c2a8431e0dc57873 /src/helper
parentconfig.h - remove all defines we never use (diff)
downloadinkscape-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/helper')
-rw-r--r--src/helper/gettext.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/helper/gettext.cpp b/src/helper/gettext.cpp
index 226304267..e985267b7 100644
--- a/src/helper/gettext.cpp
+++ b/src/helper/gettext.cpp
@@ -27,7 +27,7 @@
# include "config.h"
#endif
-#ifdef WIN32
+#ifdef _WIN32
#include <windows.h>
#endif
@@ -43,7 +43,7 @@ namespace Inkscape {
/** does all required gettext initialization and takes care of the respective locale directory paths */
void initialize_gettext() {
-#ifdef WIN32
+#ifdef _WIN32
gchar *datadir = g_win32_get_package_installation_directory_of_module(NULL);
// obtain short path to executable dir and pass it
@@ -90,7 +90,7 @@ void bind_textdomain_codeset_utf8() {
* for now do something even easier - switch console encoding to UTF8 and be done with it!
* this also works nicely on MSYS consoles where UTF8 encoding is used by default, too */
void bind_textdomain_codeset_console() {
-#ifdef WIN32
+#ifdef _WIN32
bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
#else
std::string charset;