[Emacs-diffs] trunk r113027: * frame.c (x_report_frame_params): Cast parent_desc to uintptr_t.

[Paul Eggert]

------------------------------------------------------------
revno: 113027
revision-id: address@hidden
parent: address@hidden
author: Paul Eggert  <address@hidden>
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2013-06-17 14:12:21 -0700
message:
  * frame.c (x_report_frame_params): Cast parent_desc to uintptr_t.
  
  Needed if HAVE_NTGUI.  Reported by Juanma Barranquero.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/frame.c                    frame.c-20091113204419-o5vbwnq5f7feedwu-243

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-06-17 21:10:31 +0000
+++ b/src/ChangeLog     2013-06-17 21:12:21 +0000
@@ -1,5 +1,8 @@
 2013-06-17  Paul Eggert  <address@hidden>
 
+       * frame.c (x_report_frame_params): Cast parent_desc to uintptr_t.
+       Needed if HAVE_NTGUI.  Reported by Juanma Barranquero.
+
        * nsfont.m (ns_registry_to_script): Parenthesize while expression.
 
 2013-06-17  Eli Zaretskii  <address@hidden>

=== modified file 'src/frame.c'
--- a/src/frame.c       2013-06-03 18:29:30 +0000
+++ b/src/frame.c       2013-06-17 21:12:21 +0000
@@ -2925,7 +2925,7 @@
   if (FRAME_X_OUTPUT (f)->parent_desc == FRAME_X_DISPLAY_INFO (f)->root_window)
     tem = Qnil;
   else
-    XSETFASTINT (tem, FRAME_X_OUTPUT (f)->parent_desc);
+    tem = make_natnum ((uintptr_t) FRAME_X_OUTPUT (f)->parent_desc);
   store_in_alist (alistptr, Qexplicit_name, (f->explicit_name ? Qt : Qnil));
   store_in_alist (alistptr, Qparent_id, tem);
   store_in_alist (alistptr, Qtool_bar_position, f->tool_bar_position);