* frame.c (x_report_frame_params): Cast parent_desc to uintptr_t.

Needed if HAVE_NTGUI.  Reported by Juanma Barranquero.

diff --git a/src/ChangeLog b/src/ChangeLog
index 04e99446fa5d3a5e1f272d62518cc6f0e82e9855..9a23c144e827a3a56f440f10cb744f7bf1d2ba77 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2013-06-17  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * 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  <eliz@gnu.org>

diff --git a/src/frame.c b/src/frame.c
index a207ef690da63f04c65dd139a8430d68202e48f1..ba9074ddebed117febfe9d804ff91e8f8e8f06a5 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -2925,7 +2925,7 @@ x_report_frame_params (struct frame *f, Lisp_Object *alistptr)
   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);