# HG changeset patch # User YAMAMOTO Mitsuharu # Date 1144829185 0 # Node ID d1856dc3952f2d6e34eebfdfdc53df7c429b13c5 # Parent 609c61a0071dd1fd1981a2926b92d138f3fd927b (syms_of_fontset, Fset_fontset_font): Put extern and EXFUN in #ifdef HAVE_WINDOW_SYSTEM. (syms_of_xfns, syms_of_xsmfns, syms_of_xselect, syms_of_xterm): Put externs in #ifdef HAVE_X_WINDOWS. (syms_of_macfns, syms_of_macselect, syms_of_macterm) (syms_of_macmenu, syms_of_mac) [MAC_OS]: Add externs. (init_mac_osx_environment) [MAC_OSX]: Add extern. diff -r 609c61a0071d -r d1856dc3952f src/lisp.h --- a/src/lisp.h Wed Apr 12 08:05:52 2006 +0000 +++ b/src/lisp.h Wed Apr 12 08:06:25 2006 +0000 @@ -3198,10 +3198,14 @@ extern void syms_of_term P_ ((void)); extern void fatal () NO_RETURN; -#ifdef HAVE_X_WINDOWS +#ifdef HAVE_WINDOW_SYSTEM /* Defined in fontset.c */ extern void syms_of_fontset P_ ((void)); EXFUN (Fset_fontset_font, 4); + +/* Defined in xfns.c, w32fns.c, or macfns.c */ +EXFUN (Fxw_display_color_p, 1); +EXFUN (Fx_file_dialog, 5); #endif /* Defined in xfaces.c */ @@ -3215,12 +3219,6 @@ #ifdef HAVE_X_WINDOWS /* Defined in xfns.c */ extern void syms_of_xfns P_ ((void)); -#endif /* HAVE_X_WINDOWS */ -#ifdef HAVE_WINDOW_SYSTEM -/* Defined in xfns.c, w32fns.c, or macfns.c */ -EXFUN (Fxw_display_color_p, 1); -EXFUN (Fx_file_dialog, 5); -#endif /* HAVE_WINDOW_SYSTEM */ /* Defined in xsmfns.c */ extern void syms_of_xsmfns P_ ((void)); @@ -3230,11 +3228,32 @@ /* Defined in xterm.c */ extern void syms_of_xterm P_ ((void)); +#endif /* HAVE_X_WINDOWS */ #ifdef MSDOS /* Defined in msdos.c */ EXFUN (Fmsdos_downcase_filename, 1); #endif + +#ifdef MAC_OS +/* Defined in macfns.c */ +extern void syms_of_macfns P_ ((void)); + +/* Defined in macselect.c */ +extern void syms_of_macselect P_ ((void)); + +/* Defined in macterm.c */ +extern void syms_of_macterm P_ ((void)); + +/* Defined in macmenu.c */ +extern void syms_of_macmenu P_ ((void)); + +/* Defined in mac.c */ +extern void syms_of_mac P_ ((void)); +#ifdef MAC_OSX +extern void init_mac_osx_environment P_ ((void)); +#endif /* MAC_OSX */ +#endif /* MAC_OS */ /* Nonzero means Emacs has already been initialized. Used during startup to detect startup of dumped Emacs. */