Fix NextStep build problems with globals.h introducion.

* src/globals.h (struct emacs_globals): Add f_ns_input_file,
f_ns_input_font, f_ns_input_fontsize, f_ns_input_line,
f_ns_input_color, f_ns_input_text, f_ns_working_text,
f_ns_input_spi_name, f_ns_input_spi_arg, f_ns_alternate_modifier,
f_ns_right_alternate_modifier, f_ns_command_modifier,
f_ns_right_command_modifier, f_ns_control_modifier,
f_ns_right_control_modifier, f_ns_function_modifier,
f_ns_antialias_text, f_ns_confirm_quit, f_Vns_icon_type_alist,
f_Vns_version_string, f_Vns_sent_selection_hooks,
f_Vns_lost_selection_hooks, f_Vselection_alist, f_Vns_reg_to_script
and corresponding defines.

* src/nsfns.m (Vmenu_bar_mode, Vtool_bar_mode): Remove declaration.
(Vns_icon_type_alist, Vns_version_string): Move to globals.h.
(syms_of_nsfns): Remove & from DEFVAR_LISP calls.

* src/nsfont.m (Vns_reg_to_script, ns_antialias_text): Move to
globals.h.
(syms_of_nsfont): Remove & from DEFVAR_LISP.

* src/nsselect.m (Vns_sent_selection_hooks, Vns_lost_selection_hooks
(Vselection_alist, Vselection_converter_alist): Move to globals.h.
(syms_of_nsselect): Remove & from DEFVAR_LISP.

* src/nsterm.m (ns_input_file, ns_input_font, ns_input_fontsize)
(ns_input_line, ns_input_color, ns_input_text, ns_working_text)
(ns_input_spi_name, ns_input_spi_arg)
(ns_alternate_modifier, ns_right_alternate_modifier)
(ns_command_modifier, ns_right_command_modifier, ns_control_modifier)
(ns_right_control_modifier, ns_function_modifier)
(ns_antialias_text, ns_confirm_quit): Move to globals.h.
(Vx_toolkit_scroll_bars, x_use_underline_position_properties)
(x_underline_at_descent_line): Remove declaration.
(syms_of_nsterm): Remove & from DEFVAR_LISP and DEFVAR_BOOL.

* src/nsmenu.m (Voverriding_local_map, Voverriding_local_map_menu_flag):
Remove declaration.

1 files changed, 1 insertions, 3 deletions

diff --git a/src/nsfont.m b/src/nsfont.m
index 9dc0fb5160d..03b6d56ef09 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -48,10 +48,8 @@ Author: Adrian Robert (arobert@cogsci.ucsd.edu)
 
 extern Lisp_Object Qns;
 extern Lisp_Object Qnormal, Qbold, Qitalic, Qcondensed, Qexpanded;
-static Lisp_Object Vns_reg_to_script;
 static Lisp_Object Qapple, Qroman, Qmedium;
 extern Lisp_Object Qappend;
-extern Lisp_Object ns_antialias_text;
 extern float ns_antialias_threshold;
 extern int ns_tmp_flags;
 extern struct nsfont_info *ns_tmp_font;
@@ -1517,7 +1515,7 @@ syms_of_nsfont (void)
   DEFSYM (Qapple, "apple");
   DEFSYM (Qroman, "roman");
   DEFSYM (Qmedium, "medium");
-  DEFVAR_LISP ("ns-reg-to-script", &Vns_reg_to_script,
+  DEFVAR_LISP ("ns-reg-to-script", Vns_reg_to_script,
                doc: /* Internal use: maps font registry to unicode script. */);
 }