[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112056: Fix problems with MSVC build
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112056: Fix problems with MSVC build reported in bug #13939. |
Date: |
Sat, 16 Mar 2013 10:55:38 +0200 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 112056
fixes bug: http://debbugs.gnu.org/13939
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2013-03-16 10:55:38 +0200
message:
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.
modified:
nt/ChangeLog
nt/inc/stdint.h
nt/nmake.defs
=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog 2013-03-15 17:12:03 +0000
+++ b/nt/ChangeLog 2013-03-16 08:55:38 +0000
@@ -1,3 +1,10 @@
+2013-03-16 Eli Zaretskii <address@hidden>
+
+ 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 <address@hidden>
* config.nt: Sync with autogen/config.in.
=== modified file 'nt/inc/stdint.h'
--- a/nt/inc/stdint.h 2013-01-01 09:11:05 +0000
+++ b/nt/inc/stdint.h 2013-03-16 08:55:38 +0000
@@ -38,6 +38,7 @@
#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 @@
#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
=== modified file 'nt/nmake.defs'
--- a/nt/nmake.defs 2013-01-02 16:13:04 +0000
+++ b/nt/nmake.defs 2013-03-16 08:55:38 +0000
@@ -117,7 +117,7 @@
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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112056: Fix problems with MSVC build reported in bug #13939.,
Eli Zaretskii <=