diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-03-16 10:55:38 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-03-16 10:55:38 +0200 |
| commit | 53761081f76cf7f6e341658ff9412fb4f41e9a74 (patch) | |
| tree | 87f40b87e9fa62de41c909fe4cbf7b70817f0471 | |
| parent | 12bc3154f5e8fc54e3cdcc977ff92896a44a7596 (diff) | |
| download | emacs-53761081f76cf7f6e341658ff9412fb4f41e9a74.tar.gz | |
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.
| -rw-r--r-- | nt/ChangeLog | 7 | ||||
| -rw-r--r-- | nt/inc/stdint.h | 2 | ||||
| -rw-r--r-- | nt/nmake.defs | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index f437b7433d2..7eb928b203b 100644 --- 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 c8704e25910..c8b3aba0916 100644 --- 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 69e8bb67340..04a3f1660a8 100644 --- a/nt/nmake.defs +++ b/nt/nmake.defs @@ -117,7 +117,7 @@ RC_INCLUDE = -i USE_CRT_DLL = 1
-!if USE_CRT_DLL
+!if $(USE_CRT_DLL)
libc = msvcrt$(D).lib
EMACS_EXTRA_C_FLAGS= -D_DLL -D_MT -DUSE_CRT_DLL=1
!else
|