Fix problems with MSVC build reported in bug #13939.

 nt/inc/stdint.h (UINTPTR_MAX): Define.
 nt/nmake.defs (libc): Fix syntax of !if conditional.

diff --git a/nt/ChangeLog b/nt/ChangeLog
index f437b7433d255881b617afa9ad3a99c77b9f3675..7eb928b203b532ed495aad08656f0a6c1001e3e4 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,10 @@
+2013-03-16  Eli Zaretskii  <eliz@gnu.org>
+
+       Fix the MSVC build.  (Bug#13939)
+       * inc/stdint.h (UINTPTR_MAX): Define.
+
+       * nmake.defs (libc): Fix syntax of !if conditional.
+
 2013-03-15  Juanma Barranquero  <lekktu@gmail.com>
 
        * config.nt: Sync with autogen/config.in.

diff --git a/nt/inc/stdint.h b/nt/inc/stdint.h
index c8704e25910cd6e38b295929f1ae6de2ca18de55..c8b3aba091642e9a45310fe35d65301c565bcb6e 100644 (file)
--- a/nt/inc/stdint.h
+++ b/nt/inc/stdint.h
@@ -38,6 +38,7 @@ typedef unsigned __int64 uint64_t;
 #define INT64_MIN (~INT64_MAX)
 #define INTPTR_MAX INT64_MAX
 #define INTPTR_MIN INT64_MIN
+#define UINTPTR_MAX UINT64_MAX
 #define UINTMAX_MAX UINT64_MAX
 #define UINTMAX_MIN UINT64_MIN
 #define INTMAX_MAX INT64_MAX
@@ -53,6 +54,7 @@ typedef unsigned int uint32_t;
 #define INT32_MIN (~INT32_MAX)
 #define INTPTR_MAX INT32_MAX
 #define INTPTR_MIN INT32_MIN
+#define UINTPTR_MAX UINT32_MAX
 #define UINTMAX_MAX UINT32_MAX
 #define UINTMAX_MIN UINT32_MIN
 #define INTMAX_MAX INT32_MAX

diff --git a/nt/nmake.defs b/nt/nmake.defs
index 69e8bb67340d6932fcd8b9326766b4ced2f5e9e6..04a3f1660a818694ae894cd9406d59bdc1983f16 100644 (file)
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -117,7 +117,7 @@ RC_INCLUDE  = -i
 \r
 USE_CRT_DLL    = 1\r
 \r
-!if USE_CRT_DLL\r
+!if $(USE_CRT_DLL)\r
 libc           = msvcrt$(D).lib\r
 EMACS_EXTRA_C_FLAGS= -D_DLL -D_MT -DUSE_CRT_DLL=1\r
 !else\r