Fix the MS-Windows build broken by 2011-01-30T23:34:18Z!eggert@cs.ucla.edu and 2011-01-31T08:15:13Z!eggert@cs.ucla.edu.

 lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/strftime.$(O) and
 $(BLD)/time_r.$(O).
 ($(BLD)/dtoastr.$(O)): Depend on $(EMACS_ROOT)/src/s/ms-w32.h and
 $(EMACS_ROOT)/src/m/intel386.h.
 ($(BLD)/strftime.$(O)): 
 ($(BLD)/time_r.$(O)): Define prerequisites.
 src/makefile.w32-in (OBJ2): Remove strftime.$(O).
 ($(BLD)/strftime.$(O)): Remove prerequisites.
 lib-src/makefile.w32-in (VERSION): Don't define, defined on nt/config.nt.
 (ECLIENT_CFLAGS): Remove -DVERSION.
 ($(BLD)/emacsclient.$(O)): Don't depend on makefile.w32-in.
 nt/config.nt (VERSION): Uncomment definition.
 (restrict): Define.
 nt/inc/stdbool.h: New file.
 admin/admin.el (set-version): Remove lib-src/makefile.w32-in.  Add
 nt/config.nt.

1 files changed, 3 insertions, 2 deletions

diff --git a/admin/admin.el b/admin/admin.el
index 739c769b352..9f87e9b2590 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -73,8 +73,9 @@ Root must be the root of an Emacs source tree."
                        (rx (and ".TH EMACS" (1+ not-newline)
                                 "GNU Emacs" (1+ space)
                                 (submatch (1+ (in "0-9."))))))
-  (set-version-in-file root "lib-src/makefile.w32-in" version
-                       (rx (and "VERSION" (0+ space) "=" (0+ space)
+  (set-version-in-file root "nt/config.nt" version
+                       (rx (and bol "#" (0+ blank) "define" (1+ blank)
+                                "VERSION" (1+ blank)
                                 (submatch (1+ (in "0-9."))))))
   (set-version-in-file root "nt/makefile.w32-in" version
                        (rx (and "VERSION" (0+ space) "=" (0+ space)