summaryrefslogtreecommitdiffstats
path: root/src/inkscape.cpp
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/inkscape.cpp
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/inkscape.cpp')
-rw-r--r--src/inkscape.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index 67bedb1f8..ca145202c 100644
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
@@ -70,7 +70,7 @@ static void (* segv_handler) (int) = SIG_DFL;
static void (* abrt_handler) (int) = SIG_DFL;
static void (* fpe_handler) (int) = SIG_DFL;
static void (* ill_handler) (int) = SIG_DFL;
-#ifndef WIN32
+#ifndef _WIN32
static void (* bus_handler) (int) = SIG_DFL;
#endif
@@ -78,7 +78,7 @@ static void (* bus_handler) (int) = SIG_DFL;
#define SP_INDENT 8
-#ifdef WIN32
+#ifdef _WIN32
typedef int uid_t;
#define getuid() 0
#endif
@@ -449,7 +449,7 @@ Application::Application(const char* argv, bool use_gui) :
abrt_handler = signal (SIGABRT, Application::crash_handler);
fpe_handler = signal (SIGFPE, Application::crash_handler);
ill_handler = signal (SIGILL, Application::crash_handler);
-#ifndef WIN32
+#ifndef _WIN32
bus_handler = signal (SIGBUS, Application::crash_handler);
#endif
@@ -518,7 +518,7 @@ Application::Application(const char* argv, bool use_gui) :
/* DebugDialog redirection. On Linux, default to OFF, on Win32, default to ON.
* Use only if use_gui is enabled
*/
-#ifdef WIN32
+#ifdef _WIN32
#define DEFAULT_LOG_REDIRECT true
#else
#define DEFAULT_LOG_REDIRECT false
@@ -613,7 +613,7 @@ Application::crash_handler (int /*signum*/)
signal (SIGABRT, abrt_handler );
signal (SIGFPE, fpe_handler );
signal (SIGILL, ill_handler );
-#ifndef WIN32
+#ifndef _WIN32
signal (SIGBUS, bus_handler );
#endif