Fix previous change in w32menu.c.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5f75c69b96a0369eb479e103e8c370b647a1829d..a1c7eb561a0d6f13865b17e26f987af2cad3adbb 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 <fabrice.popineau@supelec.fr>.
 

diff --git a/src/w32menu.c b/src/w32menu.c
index a5f4c3881b551c59a6c21e96325d6527ca82ad48..871baedd0d30e50cdb8716f82c87ac1391dbcccd 100644 (file)
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -1536,10 +1536,10 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item)
            {
              /* 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)
            {