andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some compilation errors in nsfns.c

Browse source 
* nsfns.m: extern declare Vmenu_bar_mode, Vtool_bar_mode.
(ns_get_screen): Don't assign integer to f.
(Fx_display_color_cells): Declarations before statements.
This commit is contained in:
Jan D 2010-06-29 11:49:20 +02:00
parent 62d115efc9
commit 5d1d3d0461
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2010-06-29 Jan Djärv <jan.h.d@swipnet.se>
* nsfns.m: extern declare Vmenu_bar_mode, Vtool_bar_mode.
(ns_get_screen): Don't assign integer to f.
(Fx_display_color_cells): Declarations before statements.
2010-06-28 Jan Djärv <jan.h.d@swipnet.se>
* xfns.c (x_default_font_parameter): Remove got_from_system

12
src/nsfns.m
View file

@ -83,6 +83,10 @@ extern Lisp_Object Qunsplittable, Qmenu_bar_lines, Qbuffer_predicate, Qtitle;
extern Lisp_Object Qnone;
extern Lisp_Object Vframe_title_format;
/* The below are defined in frame.c. */
extern Lisp_Object Vmenu_bar_mode, Vtool_bar_mode;
Lisp_Object Qbuffered;
Lisp_Object Qfontsize;
@ -224,7 +228,8 @@ ns_get_screen (Lisp_Object screen)
else
{
struct ns_display_info *dpyinfo = terminal->display_info.ns;
f = (dpyinfo->x_focus_frame || dpyinfo->x_highlight_frame);
f = dpyinfo->x_focus_frame
? dpyinfo->x_focus_frame : dpyinfo->x_highlight_frame;
}
return ((f && FRAME_NS_P (f)) ? [[FRAME_NS_VIEW (f) window] screen]
@ -2381,9 +2386,10 @@ If omitted or nil, that stands for the selected frame's display. */)
(display)
Lisp_Object display;
{
struct ns_display_info *dpyinfo;
check_ns ();
struct ns_display_info *dpyinfo = check_ns_display_info (display);
dpyinfo = check_ns_display_info (display);
/* We force 24+ bit depths to 24-bit to prevent an overflow. */
return make_number (1 << min (dpyinfo->n_planes, 24));
}