procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

src/frame.c (x_report_frame_params): Cast to avoid compiler warnings.

Browse source
This commit is contained in:
Eli Zaretskii 2011-09-09 11:32:43 +03:00
parent 69f4b6184f
commit 208a048da7
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2011-09-09 Eli Zaretskii <eliz@gnu.org>
* frame.c (x_report_frame_params): Cast to avoid compiler warnings.
2011-09-08 Martin Rudalics <rudalics@gmx.at>
* window.c (Fset_window_prev_buffers, Fset_window_next_buffers):

8
src/frame.c
View file

@ -3098,7 +3098,11 @@ x_report_frame_params (struct frame *f, Lisp_Object *alistptr)
for non-toolkit scroll bar.
ruler-mode.el depends on this. */
: Qnil));
w = FRAME_X_WINDOW (f);
/* FRAME_X_WINDOW is not guaranteed to return an integer. E.g., on
MS-Windows it returns a value whose type is HANDLE, which is
actually a pointer. Explicit casting avoids compiler
warnings. */
w = (unsigned long) FRAME_X_WINDOW (f);
sprintf (buf, "%lu", w);
store_in_alist (alistptr, Qwindow_id,
build_string (buf));
@ -3108,7 +3112,7 @@ x_report_frame_params (struct frame *f, Lisp_Object *alistptr)
if (FRAME_X_OUTPUT (f)->widget)
#endif
{
w = FRAME_OUTER_WINDOW (f);
w = (unsigned long) FRAME_OUTER_WINDOW (f);
sprintf (buf, "%lu", w);
}
store_in_alist (alistptr, Qouter_window_id,