From 05291f649ed454dc8547d5a7d6de4bbb861f7573 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Sat, 15 Sep 2018 14:42:20 +0200 Subject: Fix eaae266840146a0faa3332f253ba7bd63eecbb21 (cherry picked from commit 11504fc9060729939703c380bcaa71cfc36ea351) --- src/io/sys.cpp | 7 ++++++- src/main.cpp | 7 ++----- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/io/sys.cpp b/src/io/sys.cpp index 21ee94ed3..c56119fb0 100644 --- a/src/io/sys.cpp +++ b/src/io/sys.cpp @@ -16,6 +16,11 @@ #endif #include +#ifdef WIN32 +#include +#include +#endif + #include #include #include @@ -74,7 +79,7 @@ FILE *Inkscape::IO::fopen_utf8name( char const *utf8name, char const *mode ) Glib::ustring how( mode ); if ( how.find("w") != Glib::ustring::npos ) { #ifdef WIN32 - setmode(fileno(stdout), O_BINARY) + setmode(fileno(stdout), O_BINARY); #endif return stdout; } else { diff --git a/src/main.cpp b/src/main.cpp index 3524d61bb..290579a01 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -196,7 +196,7 @@ static void do_query_dimension (SPDocument *doc, bool extent, Geom::Dim2 const a static void do_query_all (SPDocument *doc); static void do_query_all_recurse (SPObject *o); static void do_print_message(const char *message, ...); -static bool detect_pipe_in_filename(const char *filename); +static void detect_pipe_in_filename(const char *filename); static gchar *sp_global_printer = nullptr; static gchar *sp_export_png = nullptr; @@ -2250,16 +2250,13 @@ static void do_print_message(const char *message, ...) * In case it is a pipe the variable sp_writingToPipe is set. * * \param filename Filename to check for a pipe. - * \return true if the filename is a pipe. */ -static bool detect_pipe_in_filename(const char *filename) +static void detect_pipe_in_filename(const char *filename) { if (g_strcmp0(filename, "-") == 0) { sp_writingToPipe = TRUE; - return true; } - return false; } /* -- cgit v1.2.3