3 files changed, 17 insertions, 1 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index aa9d3fe7fc6..ff62d4fc343 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,17 @@
+2005-06-13  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in ($(DOC)): Fix last change.
+
+2005-06-12  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in ($(DOC)): Depend on make-docfile.exe,
+        temacs.exe, and the preloaded *.elc files.  This avoids
+        unnecessary dumping and DOC rebuilding.
+
+2005-06-04  Eli Zaretskii  <eliz@gnu.org>
+
+        * ntlib.h (fileno): Don't define if already defined.
+
 2005-05-25  Thien-Thi Nguyen  <ttn@gnu.org>
 
         * yow.c (setup_yow): Use EXIT_FAILURE in case no separators found.
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 0f806912be5..fbb5559fd80 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -248,7 +248,7 @@ lisp2 = \
 
 
 DOC           = DOC
-$(DOC):         make-docfile
+$(DOC):         $(BLD) $(BLD)/make-docfile.exe ../src/$(BLD)/temacs.exe $(lisp1) $(lisp2)
                 - $(DEL) $(DOC)
                 "$(THISDIR)/$(BLD)/make-docfile" -o $(DOC) -d ../src $(obj)
                 "$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(lisp1)
diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h
index 523e3d6fd49..4dd9cae9796 100644
--- a/lib-src/ntlib.h
+++ b/lib-src/ntlib.h
@@ -90,7 +90,9 @@ int fchown (int fd, int uid, int gid);
 #define fcloseall _fcloseall
 #define fdopen    _fdopen
 #define fgetchar  _fgetchar
+#ifndef fileno
 #define fileno    _fileno
+#endif
 #define flushall  _flushall
 #define fputchar  _fputchar
 #define getcwd    _getcwd