aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2012-07-21 22:26:25 +0300
committerEli Zaretskii2012-07-21 22:26:25 +0300
commit37a9eac80c07eec4f17917433bc8c406e812e394 (patch)
tree40e833869982edfc721124c35debe94e43c3a4e7 /src
parent1ada2e55c700e8971a759241c0935060542c8179 (diff)
downloademacs-37a9eac80c07eec4f17917433bc8c406e812e394.tar.gz
emacs-37a9eac80c07eec4f17917433bc8c406e812e394.zip
Fix previous change in w32menu.c.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/w32menu.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 5f75c69b96a..a1c7eb561a0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -5,7 +5,7 @@
5 http://lists.gnu.org/archive/html/emacs-devel/2012-06/msg00417.html 5 http://lists.gnu.org/archive/html/emacs-devel/2012-06/msg00417.html
6 for the reasons. 6 for the reasons.
7 7
8 * w32menu.c (add_menu_item): Cast to UINT_PTR when assigning 8 * w32menu.c (add_menu_item): Cast to ULONG_PTR when assigning
9 info.dwItemData. Fixes crashes on 64-bit Windows. Suggested by 9 info.dwItemData. Fixes crashes on 64-bit Windows. Suggested by
10 Fabrice Popineau <fabrice.popineau@supelec.fr>. 10 Fabrice Popineau <fabrice.popineau@supelec.fr>.
11 11
diff --git a/src/w32menu.c b/src/w32menu.c
index a5f4c3881b5..871baedd0d3 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -1536,10 +1536,10 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item)
1536 { 1536 {
1537 /* As of Jul-2012, w32api headers say that dwItemData 1537 /* As of Jul-2012, w32api headers say that dwItemData
1538 has DWORD type, but that's a bug: it should actually 1538 has DWORD type, but that's a bug: it should actually
1539 be UINT_PTR, which is correct for 32-bit and 64-bit 1539 be ULONG_PTR, which is correct for 32-bit and 64-bit
1540 Windows alike. MSVC headers get it right; hopefully, 1540 Windows alike. MSVC headers get it right; hopefully,
1541 MinGW headers will, too. */ 1541 MinGW headers will, too. */
1542 info.dwItemData = (UINT_PTR) XLI (wv->help); 1542 info.dwItemData = (ULONG_PTR) XLI (wv->help);
1543 } 1543 }
1544 if (wv->button_type == BUTTON_TYPE_RADIO) 1544 if (wv->button_type == BUTTON_TYPE_RADIO)
1545 { 1545 {