[Emacs-diffs] /srv/bzr/emacs/trunk r109182: Fix previous change in w32menu.c.

[Eli Zaretskii]

------------------------------------------------------------
revno: 109182
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2012-07-21 22:26:25 +0300
message:
  Fix previous change in w32menu.c.
modified:
  src/ChangeLog
  src/w32menu.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-21 14:11:33 +0000
+++ b/src/ChangeLog     2012-07-21 19:26:25 +0000
@@ -5,7 +5,7 @@
        http://lists.gnu.org/archive/html/emacs-devel/2012-06/msg00417.html
        for the reasons.
 
-       * w32menu.c (add_menu_item): Cast to UINT_PTR when assigning
+       * w32menu.c (add_menu_item): Cast to ULONG_PTR when assigning
        info.dwItemData.  Fixes crashes on 64-bit Windows.  Suggested by
        Fabrice Popineau <address@hidden>.
 

=== modified file 'src/w32menu.c'
--- a/src/w32menu.c     2012-07-21 13:33:32 +0000
+++ b/src/w32menu.c     2012-07-21 19:26:25 +0000
@@ -1536,10 +1536,10 @@
            {
              /* As of Jul-2012, w32api headers say that dwItemData
                 has DWORD type, but that's a bug: it should actually
-                be UINT_PTR, which is correct for 32-bit and 64-bit
+                be ULONG_PTR, which is correct for 32-bit and 64-bit
                 Windows alike.  MSVC headers get it right; hopefully,
                 MinGW headers will, too.  */
-             info.dwItemData = (UINT_PTR) XLI (wv->help);
+             info.dwItemData = (ULONG_PTR) XLI (wv->help);
            }
          if (wv->button_type == BUTTON_TYPE_RADIO)
            {