# HG changeset patch
# User Martin Panter <vadmium `a gmail.com>
# Date 1241274500 0
# Branch trunk
# Node ID 2e9be192c46ccf635d9a5575ae998ebd6844140d
# Parent  49dced1d2e1667cfe1f99112a0091ff2db68a366
# Parent  9c6d1a4622b21d3298548b14a0aeca3ed8dba4b2
Merge: Binary mode for "-O -" using _setmode.

diff -r 49dced1d2e16 -r 2e9be192c46c src/ChangeLog
--- a/src/ChangeLog	Sun Apr 26 10:18:13 2009 +0000
+++ b/src/ChangeLog	Sat May 02 14:28:20 2009 +0000
@@ -1,3 +1,7 @@
+2009-05-02  Martin Panter  <vadmium `a gmail.com>
+
+	* main.c (main) [_WIN32]: Set stdout to binary mode for "-O -".
+
 2009-04-26  Martin Panter  <vadmium `a gmail.com>
 
 	* ftp.c (ftp_retrieve_list): Don't use symlinks on Windows despite
diff -r 49dced1d2e16 -r 2e9be192c46c src/main.c
--- a/src/main.c	Sun Apr 26 10:18:13 2009 +0000
+++ b/src/main.c	Sat May 02 14:28:20 2009 +0000
@@ -59,6 +59,11 @@
 /* On GNU system this will include system-wide getopt.h. */
 #include "getopt.h"
 
+#ifdef _WIN32 /* need to change stdout to binary mode */
+# include <io.h>
+# include <fcntl.h>
+#endif
+
 #ifndef PATH_SEPARATOR
 # define PATH_SEPARATOR '/'
 #endif
@@ -956,7 +961,12 @@
   if (opt.output_document)
     {
       if (HYPHENP (opt.output_document))
-        output_stream = stdout;
+        {
+          output_stream = stdout;
+#ifdef _WIN32
+          _setmode (_fileno (output_stream), _O_BINARY);
+#endif
+        }
       else
         {
           struct_fstat st;