Merge from mainline.

2 files changed, 11 insertions, 0 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 81c6e6fe9b4..958539cc044 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -25,6 +25,12 @@
         Declare non-'main' functions and variables to be static.
         * ebrowse.c: Omit redundant function prototypes.
 
+2011-02-21  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in ($(BLD)/ctags.$(O), $(BLD)/emacsclient.$(O))
+        ($(BLD)/etags.$(O), $(BLD)/movemail.$(O), $(BLD)/ntlib.$(O)):
+        Depend on $(EMACS_ROOT)/nt/inc/sys/stat.h.
+
 2011-02-21  Ben Key  <bkey76@gmail.com>  (tiny change)
 
         * make-docfile.c (scan_c_file): Adapt DEFVAR_PER_BUFFER case to
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 77931c1a36b..bc7b1b27baf 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -374,6 +374,7 @@ $(BLD)/alloca.$(O) : \
 $(BLD)/ctags.$(O) : \
         $(SRC)/ctags.c \
         $(EMACS_ROOT)/nt/inc/sys/param.h \
+        $(EMACS_ROOT)/nt/inc/sys/stat.h \
         $(EMACS_ROOT)/src/s/ms-w32.h \
         $(EMACS_ROOT)/src/m/intel386.h \
         $(EMACS_ROOT)/lib-src/../src/config.h \
@@ -382,6 +383,7 @@ $(BLD)/ctags.$(O) : \
 
 $(BLD)/emacsclient.$(O) : \
         $(SRC)/emacsclient.c \
+        $(EMACS_ROOT)/nt/inc/sys/stat.h \
         $(EMACS_ROOT)/src/s/ms-w32.h \
         $(EMACS_ROOT)/src/m/intel386.h \
         $(EMACS_ROOT)/lib-src/../src/config.h
@@ -389,6 +391,7 @@ $(BLD)/emacsclient.$(O) : \
 $(BLD)/etags.$(O) : \
         $(SRC)/etags.c \
         $(EMACS_ROOT)/nt/inc/sys/param.h \
+        $(EMACS_ROOT)/nt/inc/sys/stat.h \
         $(EMACS_ROOT)/src/s/ms-w32.h \
         $(EMACS_ROOT)/src/m/intel386.h \
         $(EMACS_ROOT)/lib-src/../src/config.h \
@@ -429,6 +432,7 @@ $(BLD)/movemail.$(O) : \
         $(EMACS_ROOT)/src/m/intel386.h \
         $(EMACS_ROOT)/lib-src/../src/config.h \
         $(EMACS_ROOT)/nt/inc/sys/file.h \
+        $(EMACS_ROOT)/nt/inc/sys/stat.h \
         $(EMACS_ROOT)/lib-src/../src/syswait.h \
         $(EMACS_ROOT)/nt/inc/pwd.h \
         $(SRC)/ntlib.h
@@ -437,6 +441,7 @@ $(BLD)/movemail.$(O) : \
 $(BLD)/ntlib.$(O) : \
         $(SRC)/ntlib.c \
         $(SRC)/ntlib.h \
+        $(EMACS_ROOT)/nt/inc/sys/stat.h \
         $(EMACS_ROOT)/nt/inc/pwd.h
 
 $(BLD)/pop.$(O) : \