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/extension/internal/cairo-render-context.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/extension/internal/cairo-render-context.cpp') diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp index 679db9f6a..f7de8d85f 100644 --- a/src/extension/internal/cairo-render-context.cpp +++ b/src/extension/internal/cairo-render-context.cpp @@ -50,7 +50,7 @@ #include "object/sp-clippath.h" #include "util/units.h" -#ifdef WIN32 +#ifdef _WIN32 #include "libnrtype/FontFactory.h" // USE_PANGO_WIN32 #endif @@ -270,7 +270,7 @@ bool CairoRenderContext::setPdfTarget(gchar const *utf8_fn) if (*fn == '|') { fn += 1; while (isspace(*fn)) fn += 1; -#ifndef WIN32 +#ifndef _WIN32 osp = popen(fn, "w"); #else osp = _popen(fn, "w"); @@ -297,7 +297,7 @@ bool CairoRenderContext::setPdfTarget(gchar const *utf8_fn) gchar *qn = ( *fn ? g_strdup_printf("lpr -P %s", fn) /* FIXME: quote fn */ : g_strdup("lpr") ); -#ifndef WIN32 +#ifndef _WIN32 osp = popen(qn, "w"); #else osp = _popen(qn, "w"); @@ -352,7 +352,7 @@ bool CairoRenderContext::setPsTarget(gchar const *utf8_fn) if (*fn == '|') { fn += 1; while (isspace(*fn)) fn += 1; -#ifndef WIN32 +#ifndef _WIN32 osp = popen(fn, "w"); #else osp = _popen(fn, "w"); @@ -379,7 +379,7 @@ bool CairoRenderContext::setPsTarget(gchar const *utf8_fn) gchar *qn = ( *fn ? g_strdup_printf("lpr -P %s", fn) /* FIXME: quote fn */ : g_strdup("lpr") ); -#ifndef WIN32 +#ifndef _WIN32 osp = popen(qn, "w"); #else osp = _popen(qn, "w"); -- cgit v1.2.3