diff options
| author | Glenn Morris <[email protected]> | 2012-11-20 20:47:55 -0800 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2012-11-20 20:47:55 -0800 |
| commit | 6ef2e5ef5278a807132b78c42de402925b20bfb3 (patch) | |
| tree | e5711cdfcdf8a152416c2a96e399695285a4a3a8 /nt | |
| parent | eadf1faa3cb5eea8c25a5166a9a97ebd63525c56 (diff) | |
| parent | b6729a180f4b81ac26bd7b61f5330643b2d5e994 (diff) | |
Merge from emacs-24; up to 2012-11-17T22:12:[email protected]
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 8 | ||||
| -rw-r--r-- | nt/inc/stdint.h | 3 | ||||
| -rw-r--r-- | nt/nmake.defs | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 4f9e8a2663..0eda3a699d 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,11 @@ +2012-11-21 Eli Zaretskii <[email protected]> + + * nmake.defs: Use !if, not !ifdef. For the details, see + http://lists.gnu.org/archive/html/help-emacs-windows/2012-11/msg00027.html + + * inc/stdint.h (INTPTR_MIN): + (PTRDIFF_MIN) [!__GNUC__]: Define for MSVC. + 2012-11-18 Eli Zaretskii <[email protected]> * inc/unistd.h: Don't include fcntl.h and don't define O_RDWR. diff --git a/nt/inc/stdint.h b/nt/inc/stdint.h index 5c53fa18b5..97c9bbdaee 100644 --- a/nt/inc/stdint.h +++ b/nt/inc/stdint.h @@ -37,6 +37,7 @@ typedef unsigned __int64 uint64_t; #define INT64_MAX 9223372036854775807i64 #define INT64_MIN (~INT64_MAX) #define INTPTR_MAX INT64_MAX +#define INTPTR_MIN INT64_MIN #define UINTMAX_MAX UINT64_MAX #define UINTMAX_MIN UINT64_MIN #define INTMAX_MAX INT64_MAX @@ -51,6 +52,7 @@ typedef unsigned int uint32_t; #define INT32_MAX 2147483647 #define INT32_MIN (~INT32_MAX) #define INTPTR_MAX INT32_MAX +#define INTPTR_MIN INT32_MIN #define UINTMAX_MAX UINT32_MAX #define UINTMAX_MIN UINT32_MIN #define INTMAX_MAX INT32_MAX @@ -60,6 +62,7 @@ typedef unsigned int uint32_t; #endif #define PTRDIFF_MAX INTPTR_MAX +#define PTRDIFF_MIN INTPTR_MIN #endif /* !__GNUC__ */ diff --git a/nt/nmake.defs b/nt/nmake.defs index 48809afc77..16a787ea30 100644 --- a/nt/nmake.defs +++ b/nt/nmake.defs @@ -116,7 +116,7 @@ RC_INCLUDE = -i USE_CRT_DLL = 1
-!ifdef USE_CRT_DLL
+!if USE_CRT_DLL
libc = msvcrt$(D).lib
EMACS_EXTRA_C_FLAGS= -D_DLL -D_MT -DUSE_CRT_DLL=1
!else
|