Mercurial > emacs
changeset 60358:ceeef4169240
(main): Change `#ifdef HAVE_CARBON' to `#if defined (MAC_OSX) &&
defined (HAVE_CARBON)'.
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
|---|---|
| date | Fri, 04 Mar 2005 11:06:42 +0000 |
| parents | 7cb1d5f71446 |
| children | 1c6de5f7952b |
| files | src/emacs.c |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/emacs.c Fri Mar 04 04:54:40 2005 +0000 +++ b/src/emacs.c Fri Mar 04 11:06:42 2005 +0000 @@ -1482,7 +1482,7 @@ init_ntproc (); /* must precede init_editfns. */ #endif -#ifdef HAVE_CARBON +#if defined (MAC_OSX) && defined (HAVE_CARBON) if (initialized) init_mac_osx_environment (); #endif @@ -1626,12 +1626,12 @@ syms_of_fontset (); #endif /* HAVE_NTGUI */ -#ifdef HAVE_CARBON +#if defined (MAC_OSX) && defined (HAVE_CARBON) syms_of_macterm (); syms_of_macfns (); syms_of_macmenu (); syms_of_fontset (); -#endif /* HAVE_CARBON */ +#endif /* MAC_OSX && HAVE_CARBON */ #ifdef SYMS_SYSTEM SYMS_SYSTEM;