diff options
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/frame.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 04e99446fa..9a23c144e8 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 a207ef690d..ba9074ddeb 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); |