diff options
| author | Jason Rumney | 2003-05-21 20:46:24 +0000 |
|---|---|---|
| committer | Jason Rumney | 2003-05-21 20:46:24 +0000 |
| commit | edd3ff1dfc81fa2d1230a422851506bba9526a3b (patch) | |
| tree | ff18121a1c06ccdac26adad0b403805f0dce79e1 | |
| parent | 745edc312704f07310b0992cdd4ea511b87f3a74 (diff) | |
| download | emacs-edd3ff1dfc81fa2d1230a422851506bba9526a3b.tar.gz emacs-edd3ff1dfc81fa2d1230a422851506bba9526a3b.zip | |
(main) [WINDOWSNT]: Move it here.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/emacs.c | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2fcd1249d96..1a41ae88614 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2003-05-21 Jason Rumney <jasonr@gnu.org> | ||
| 2 | |||
| 3 | * unexw32.c (_start): Remove _fmode initialization. | ||
| 4 | |||
| 5 | * emacs.c (main) [WINDOWSNT]: Move it here. | ||
| 6 | |||
| 1 | 2003-05-20 Dave Love <fx@gnu.org> | 7 | 2003-05-20 Dave Love <fx@gnu.org> |
| 2 | 8 | ||
| 3 | * s/gnu-linux.h (MAIL_USE_FLOCK): Make it conditional. | 9 | * s/gnu-linux.h (MAIL_USE_FLOCK): Make it conditional. |
diff --git a/src/emacs.c b/src/emacs.c index 095ae9e7c78..05897e9bb44 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -40,6 +40,10 @@ Boston, MA 02111-1307, USA. */ | |||
| 40 | #include <sys/ioctl.h> | 40 | #include <sys/ioctl.h> |
| 41 | #endif | 41 | #endif |
| 42 | 42 | ||
| 43 | #ifdef WINDOWSNT | ||
| 44 | #include <fcntl.h> | ||
| 45 | #endif | ||
| 46 | |||
| 43 | #include "lisp.h" | 47 | #include "lisp.h" |
| 44 | #include "commands.h" | 48 | #include "commands.h" |
| 45 | #include "intervals.h" | 49 | #include "intervals.h" |
| @@ -955,11 +959,13 @@ main (argc, argv | |||
| 955 | uninterrupt_malloc (); | 959 | uninterrupt_malloc (); |
| 956 | #endif /* not SYSTEM_MALLOC */ | 960 | #endif /* not SYSTEM_MALLOC */ |
| 957 | 961 | ||
| 958 | #ifdef MSDOS | 962 | #if defined (MSDOS) || defined (WINDOWSNT) |
| 959 | /* We do all file input/output as binary files. When we need to translate | 963 | /* We do all file input/output as binary files. When we need to translate |
| 960 | newlines, we do that manually. */ | 964 | newlines, we do that manually. */ |
| 961 | _fmode = O_BINARY; | 965 | _fmode = O_BINARY; |
| 966 | #endif /* MSDOS || WINDOWSNT */ | ||
| 962 | 967 | ||
| 968 | #ifdef MSDOS | ||
| 963 | #if __DJGPP__ >= 2 | 969 | #if __DJGPP__ >= 2 |
| 964 | if (!isatty (fileno (stdin))) | 970 | if (!isatty (fileno (stdin))) |
| 965 | setmode (fileno (stdin), O_BINARY); | 971 | setmode (fileno (stdin), O_BINARY); |