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.

3 files changed, 29 insertions, 5 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 355c7e83dab..db73491718f 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-31  Eli Zaretskii  <eliz@gnu.org>
+
+        * inc/stdbool.h: New file.
+
 2011-01-29  Eli Zaretskii  <eliz@gnu.org>
 
         * makefile.w32-in (all-other-dirs-nmake, all-other-dirs-gmake)
diff --git a/nt/config.nt b/nt/config.nt
index 53d89701c69..d612a417f4d 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -305,13 +305,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Name of package */
 #define PACKAGE "emacs"
 
-/* FIXME: This is defined by the various makefile.w32-in files for
-   now.  Revisit if/when VERSION from config.h is used by any
-   Makefile.in files.  */
-#if 0
 /* Version number of package */
 #define VERSION "24.0.50"
-#endif
 
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
@@ -319,6 +314,15 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef inline
 #endif
 
+/* Define to the equivalent of the C99 'restrict' keyword, or to
+   nothing if this is not supported.  Do not define if restrict is
+   supported directly.  */
+#ifdef __GNUC__
+# define restrict __restrict__
+#else
+# define restrict
+#endif
+
 /* Define as a marker that can be attached to declarations that might not
     be used.  This helps to reduce warnings, such as from
     GCC -Wunused-parameter.  */
diff --git a/nt/inc/stdbool.h b/nt/inc/stdbool.h
new file mode 100644
index 00000000000..521291fdd03
--- /dev/null
+++ b/nt/inc/stdbool.h
@@ -0,0 +1,16 @@
+#ifndef _NT_STDBOOL_H_
+#define _NT_STDBOOL_H_
+/*
+ * stdbool.h exists in GCC, but not in MSVC.
+ */
+
+#ifdef __GNUC__
+# include_next <stdbool.h>
+#else
+# define _Bool signed char
+# define bool _Bool
+# define false 0
+# define true 1
+#endif
+
+#endif  /* _NT_STDBOOL_H_ */