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

Needed if HAVE_NTGUI. Reported by Juanma Barranquero.

* frame.c (x_report_frame_params): Cast parent_desc to uintptr_t.
Needed if HAVE_NTGUI. Reported by Juanma Barranquero.
ec6ecaad · Paul Eggert · 0a4df6a5 · ec6ecaad · ec6ecaad
Commit ec6ecaad authored Jun 17, 2013 by Paul Eggert
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

src/ChangeLog src/ChangeLog +3 -0

src/frame.c src/frame.c +1 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
 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>

--- 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);