(main) [WINDOWSNT]: Move it here.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2fcd1249d96d2ccff4a0a07f6fa7bf6c67d7d06b..1a41ae886147598a5a82ff08836e4ec8438f0096 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-21  Jason Rumney  <jasonr@gnu.org>
+
+       * unexw32.c (_start): Remove _fmode initialization.
+
+       * emacs.c (main) [WINDOWSNT]: Move it here.
+
 2003-05-20  Dave Love  <fx@gnu.org>
 
        * s/gnu-linux.h (MAIL_USE_FLOCK): Make it conditional.

diff --git a/src/emacs.c b/src/emacs.c
index 095ae9e7c78c62f7ee1f2b0ba78894ffb8d8ecfc..05897e9bb44779229306cb997b9f469b44594dbd 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"
@@ -955,11 +959,13 @@ main (argc, argv
   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 /* MSDOS || WINDOWSNT */
 
+#ifdef MSDOS
 #if __DJGPP__ >= 2
   if (!isatty (fileno (stdin)))
     setmode (fileno (stdin), O_BINARY);