*** empty log message ***

3 files changed, 55 insertions, 3 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 1bf76f915b8..6e554444c4f 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,15 @@
+2000-08-22  Andrew Innes  <andrewi@gnu.org>
+
+        * ntlib.h (WIN32): Remove unnecessary definition.
+        (sleep): Make argument unsigned long.
+        (_WINSOCK_H): Undefine so normal winsock definitions can be used.
+
+        * ntlib.c (sleep): Make argument unsigned long.
+
+        * movemail.c (main) [WINDOWSNT]: Force binary mode for fileio.
+
+        * makefile.w32-in: New file.
+
 2000-08-20  Eli Zaretskii  <eliz@is.elta.co.il>
 
         * etags.c (canonicalize_filename) [DOS_NT]: Upcase the first
@@ -4156,5 +4168,5 @@ Tue Jul  1 01:09:07 1997  Geoff Voelker  <voelker@cs.washington.edu>
         * loadst.c (main) [XENIX]: use /usr/spool/mail, not /usr/mail.
 
 ;; Local Variables:
-;; coding: iso-2022-7bit-unix
+;; coding: iso-2022-7bit
 ;; End:
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9bc3ac19985..defd9296292 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-22  Andrew Innes  <andrewi@gnu.org>
+
+        * makefile.w32-in: New file.
+
 2000-08-22  Miles Bader  <miles@lsi.nec.co.jp>
 
         * comint.el (comint-output-filter): Compare end of
@@ -6624,5 +6628,5 @@
 See ChangeLog.8 for earlier changes.
 
 ;; Local Variables:
-;; coding: iso-2022-7bit-unix
+;; coding: iso-2022-7bit
 ;; End:
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 3e8f032a6d7..783cf14e932 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,39 @@
+2000-08-22  Andrew Innes  <andrewi@gnu.org>
+
+        * configure.bat: New file.
+
+        * gmake.defs: New file.
+
+        * nmake.defs: New file.
+
+        * makefile.w32-in: New file.
+
+        * INSTALL: Rewrite to match new configure process.
+
+        * config.nt [WINDOWSNT]: Don't declare getenv.
+        (EMACS_CONFIG_OPTIONS): Define according to compiler being used.
+
+        * addpm.c (main): Accept /q to mean install based on addpm's
+        location without asking.  Remove reference to emacs.bat which is
+        now obsolete.
+
+        * addsection.c (PTR_TO_OFFSET): Cast ptr to unsigned char*.
+
+        * paths.h: Use forward slash as directory separator in all path
+        definitions.
+        (PATH_DUMPLOADSEARCH): Revert to definition used on Unix.
+
+        * preprep.c (PTR_TO_OFFSET): Cast ptr to unsigned char *.
+
+        * runemacs.c: Remove WIN32 define.
+
+        * inc/sys/file.h (F_OK, X_OK, W_OK, R_OK, D_OK): Define if D_OK is
+        not defined.
+
+        * inc/sys/socket.h (_WINSOCK_H): Undefine if defined.
+        (fd_set): Define to new name, after including winsock.h, so we can
+        provide our own implementation.
+
 2000-07-05  Andrew Innes  <andrewi@gnu.org>
 
         * ebuild.bat: Add support for specifying make arguments.
@@ -546,5 +582,5 @@
         * _emacs: New file.
 
 ;; Local Variables:
-;; coding: iso-2022-7bit-unix
+;; coding: iso-2022-7bit
 ;; End: