* unexw32.c (_start): Remove _fmode initialization.

* emacs.c (main) [WINDOWSNT]: Move it here.

diff --git a/src/ChangeLog b/src/ChangeLog
index 068f19ea8215765ad6f233ee422a1cd8fb25d5df..ad632ce0c3f0087c08f095f9d5232c8947ff4099 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-18  Jason Rumney  <jasonr@gnu.org>
+
+       * unexw32.c (_start): Remove _fmode initialization.
+
+       * emacs.c (main) [WINDOWSNT]: Move it here.
+
 2004-01-23  Kenichi Handa  <handa@m17n.org>
 
        * fns.c (Fmd5): If OBJECT is a buffer different from the current

diff --git a/src/emacs.c b/src/emacs.c
index 274c151d180d8f19a8dd9ffe23c67492206d35ce..01a71311984d388867681789070bffffd211aa0c 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -40,6 +40,10 @@ Boston, MA 02111-1307, USA.  */
 #include <sys/ioctl.h>
 #endif
 
+#ifdef WINDOWSNT
+#include <fcntl.h>
+#endif
+
 #include "lisp.h"
 #include "commands.h"
 #include "intervals.h"
@@ -874,11 +878,13 @@ main (argc, argv, envp)
   uninterrupt_malloc ();
 #endif /* not SYSTEM_MALLOC */
 
-#ifdef MSDOS
+#if defined (MSDOS) || defined (WINDOWSNT)
   /* We do all file input/output as binary files.  When we need to translate
      newlines, we do that manually.  */
   _fmode = O_BINARY;
+#endif
 
+#ifdef MSDOS
 #if __DJGPP__ >= 2
   if (!isatty (fileno (stdin)))
     setmode (fileno (stdin), O_BINARY);

diff --git a/src/unexw32.c b/src/unexw32.c
index 7b907beda6e51166e4b66d88e0d54395763245a7..1ef7f14f73e755396523613913813ede102e9159 100644 (file)
--- a/src/unexw32.c
+++ b/src/unexw32.c
@@ -23,7 +23,6 @@ Boston, MA 02111-1307, USA.
 
 #include <config.h>
 
-#include <stdlib.h>    /* _fmode */
 #include <stdio.h>
 #include <fcntl.h>
 #include <time.h>
@@ -112,10 +111,6 @@ _start (void)
   /* Grab our malloc arena space now, before CRT starts up. */
   init_heap ();
 
-  /* The default behavior is to treat files as binary and patch up
-     text files appropriately, in accordance with the MSDOS code.  */
-  _fmode = O_BINARY;
-
   /* This prevents ctrl-c's in shells running while we're suspended from
      having us exit.  */
   SetConsoleCtrlHandler ((PHANDLER_ROUTINE) ctrl_c_handler, TRUE);