diff options
Diffstat (limited to 'src/extension/internal')
| -rw-r--r-- | src/extension/internal/cairo-render-context.cpp | 10 | ||||
| -rw-r--r-- | src/extension/internal/cdr-input.cpp | 2 | ||||
| -rw-r--r-- | src/extension/internal/pdfinput/pdf-input.cpp | 2 | ||||
| -rw-r--r-- | src/extension/internal/vsd-input.cpp | 2 | ||||
| -rw-r--r-- | src/extension/internal/wpg-input.cpp | 2 |
5 files changed, 9 insertions, 9 deletions
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"); diff --git a/src/extension/internal/cdr-input.cpp b/src/extension/internal/cdr-input.cpp index 7848927ca..b86fb5049 100644 --- a/src/extension/internal/cdr-input.cpp +++ b/src/extension/internal/cdr-input.cpp @@ -233,7 +233,7 @@ void CdrImportDialog::_setPreviewPage() SPDocument *CdrInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * uri) { - #ifdef WIN32 + #ifdef _WIN32 // RVNGFileStream uses fopen() internally which unfortunately only uses ANSI encoding on Windows // therefore attempt to convert uri to the system codepage // even if this is not possible the alternate short (8.3) file name will be used if available diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp index 21a91fa34..df04b2322 100644 --- a/src/extension/internal/pdfinput/pdf-input.cpp +++ b/src/extension/internal/pdfinput/pdf-input.cpp @@ -710,7 +710,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) { // PDFDoc is from poppler. PDFDoc is used for preview and for native import. -#ifndef WIN32 +#ifndef _WIN32 // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from // glib gstdio.c GooString *filename_goo = new GooString(uri); diff --git a/src/extension/internal/vsd-input.cpp b/src/extension/internal/vsd-input.cpp index a0b41a990..783fcfc8b 100644 --- a/src/extension/internal/vsd-input.cpp +++ b/src/extension/internal/vsd-input.cpp @@ -233,7 +233,7 @@ void VsdImportDialog::_setPreviewPage() SPDocument *VsdInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * uri) { - #ifdef WIN32 + #ifdef _WIN32 // RVNGFileStream uses fopen() internally which unfortunately only uses ANSI encoding on Windows // therefore attempt to convert uri to the system codepage // even if this is not possible the alternate short (8.3) file name will be used if available diff --git a/src/extension/internal/wpg-input.cpp b/src/extension/internal/wpg-input.cpp index a1c27e3e3..32e3a91f2 100644 --- a/src/extension/internal/wpg-input.cpp +++ b/src/extension/internal/wpg-input.cpp @@ -81,7 +81,7 @@ namespace Internal { SPDocument *WpgInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * uri) { - #ifdef WIN32 + #ifdef _WIN32 // RVNGFileStream uses fopen() internally which unfortunately only uses ANSI encoding on Windows // therefore attempt to convert uri to the system codepage // even if this is not possible the alternate short (8.3) file name will be used if available |