From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 17 Jun 2013 21:12:21 +0000 (-0700)
Subject: * frame.c (x_report_frame_params): Cast parent_desc to uintptr_t.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2016^2~73^2~21
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ec6ecaad44f4ca36e1ee7224c300222c6433471b;p=emacs.git

* 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 04e99446fa5..9a23c144e82 100644
--- 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 a207ef690da..ba9074ddebe 100644
--- 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);