Commit ec6ecaad authored by Paul Eggert's avatar Paul Eggert
Browse files

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

Needed if HAVE_NTGUI.  Reported by Juanma Barranquero.
parent 0a4df6a5
2013-06-17 Paul Eggert <eggert@cs.ucla.edu> 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. * nsfont.m (ns_registry_to_script): Parenthesize while expression.
   
2013-06-17 Eli Zaretskii <eliz@gnu.org> 2013-06-17 Eli Zaretskii <eliz@gnu.org>
......
...@@ -2925,7 +2925,7 @@ x_report_frame_params (struct frame *f, Lisp_Object *alistptr) ...@@ -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) if (FRAME_X_OUTPUT (f)->parent_desc == FRAME_X_DISPLAY_INFO (f)->root_window)
tem = Qnil; tem = Qnil;
else 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, Qexplicit_name, (f->explicit_name ? Qt : Qnil));
store_in_alist (alistptr, Qparent_id, tem); store_in_alist (alistptr, Qparent_id, tem);
store_in_alist (alistptr, Qtool_bar_position, f->tool_bar_position); store_in_alist (alistptr, Qtool_bar_position, f->tool_bar_position);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment