diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-12-17 19:46:31 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-12-17 19:46:31 +0200 |
| commit | af025ae850c8f30431cf79876c4452d9f1679250 (patch) | |
| tree | 708b8ba45eaffd8e9b3b28d7dec0192d2a517bd7 /src/frame.c | |
| parent | cf2b7efc78f0004a58b14a1eb470a306a139197d (diff) | |
Fix some warnings in w32 specific code.
src/w32term.c (w32_initialize): Declare the argument of
set_user_model as const.
src/w32menu.c <MessageBoxW_Proc>: Fix argument declarations.
(w32_menu_show): Constify some arguments passed to MessageBox.
src/w32uniscribe.c (uniscribe_font_driver): Use LISP_INITIALLY_ZERO
to initialize Lisp objects.
src/w32font.c (w32font_driver): Use LISP_INITIALLY_ZERO to
initialize Lisp objects.
src/frame.c (x_set_frame_parameters) [HAVE_X_WINDOWS]: Declare and
use variables used only on X under that condition.
src/fileio.c (Fcopy_file) [!WINDOWSNT]: Don't declare on Windows
variables not used there.
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/frame.c b/src/frame.c index 43e549235d..7699f24fbb 100644 --- a/src/frame.c +++ b/src/frame.c @@ -2807,7 +2807,9 @@ x_set_frame_parameters (struct frame *f, Lisp_Object alist) Lisp_Object *values; ptrdiff_t i, p; bool left_no_change = 0, top_no_change = 0; +#ifdef HAVE_X_WINDOWS bool icon_left_no_change = 0, icon_top_no_change = 0; +#endif bool size_changed = 0; struct gcpro gcpro1, gcpro2; @@ -2954,14 +2956,18 @@ x_set_frame_parameters (struct frame *f, Lisp_Object alist) /* If one of the icon positions was not set, preserve or default it. */ if (! TYPE_RANGED_INTEGERP (int, icon_left)) { +#ifdef HAVE_X_WINDOWS icon_left_no_change = 1; +#endif icon_left = Fcdr (Fassq (Qicon_left, f->param_alist)); if (NILP (icon_left)) XSETINT (icon_left, 0); } if (! TYPE_RANGED_INTEGERP (int, icon_top)) { +#ifdef HAVE_X_WINDOWS icon_top_no_change = 1; +#endif icon_top = Fcdr (Fassq (Qicon_top, f->param_alist)); if (NILP (icon_top)) XSETINT (icon_top, 0); |