Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 447-459)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 141-144)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-115

1 files changed, 4 insertions, 0 deletions

diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index ec407c883f3..98ecc759034 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -719,6 +719,8 @@ $(BLD)/fns.$(O) : \
         $(EMACS_ROOT)/src/s/ms-w32.h \
         $(EMACS_ROOT)/src/m/intel386.h \
         $(EMACS_ROOT)/src/config.h \
+        $(EMACS_ROOT)/nt/inc/langinfo.h \
+        $(EMACS_ROOT)/nt/inc/nl_types.h \
         $(SRC)/atimer.h \
         $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
@@ -1044,6 +1046,8 @@ $(BLD)/w32proc.$(O) : \
         $(SRC)/w32proc.c \
         $(SRC)/s/ms-w32.h \
         $(SRC)/m/intel386.h \
+        $(EMACS_ROOT)/nt/inc/langinfo.h \
+        $(EMACS_ROOT)/nt/inc/nl_types.h \
         $(SRC)/config.h \
         $(SRC)/process.h \
         $(SRC)/syssignal.h \