Merge.

diff --git a/src/ChangeLog b/src/ChangeLog
index 05b56e8c543fd374800d1033c1315b5be1eb201f..82531a83d17e981266a164d1ab71e0a93652bb8e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-27  Gisle Vanem  <gvanem@broadpark.no>
+
+       * main.c (main): "freopen (NULL,.." causes an assertion in MSVC
+       debug-mode.  I.e. NULL isn't legal. But the "CONOUT$" device works
+       fine.
+
 2009-02-27  Steven Schubiger  <stsc@member.fsf.org>
 
        * ftp.c (ftp_loop_internal): Don't claim for FTP retrievals

diff --git a/src/main.c b/src/main.c
index 02ecb1d68034b224085a4ca97c6903b1ff66bed0..7c921b77e47a4078a9e9256da8f4005e82ffa159 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1124,7 +1124,7 @@ for details.\n\n"));
         {
 #ifdef WINDOWS
           FILE *result;
-          result = freopen (NULL, "wb", stdout);
+          result = freopen ("CONAIR$", "wb", stdout);
           if (result == NULL)
             {
               logputs (LOG_NOTQUIET, _("\