diff options
| author | Andrew Choi <akochoi@shaw.ca> | 2002-04-26 23:39:06 +0000 |
|---|---|---|
| committer | Andrew Choi <akochoi@shaw.ca> | 2002-04-26 23:39:06 +0000 |
| commit | e0f712ba55fa0d073f6ab93606e428f61fc7caf2 (patch) | |
| tree | 7dc6d3403fafcbee1a83288ac840f7eba1d92b44 /src/frame.c | |
| parent | 501d8923ae2cdec4ef50f050bb66d3715ba2a8f6 (diff) | |
| download | emacs-e0f712ba55fa0d073f6ab93606e428f61fc7caf2.tar.gz emacs-e0f712ba55fa0d073f6ab93606e428f61fc7caf2.tar.bz2 emacs-e0f712ba55fa0d073f6ab93606e428f61fc7caf2.zip | |
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
lisp/ChangeLog, and src/ChangeLog for list of changes.
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/frame.c b/src/frame.c index 5525e2a9964..795183b2a2f 100644 --- a/src/frame.c +++ b/src/frame.c @@ -30,7 +30,7 @@ Boston, MA 02111-1307, USA. */ #ifdef WINDOWSNT #include "w32term.h" #endif -#ifdef macintosh +#ifdef MAC_OS #include "macterm.h" #endif #include "buffer.h" @@ -486,11 +486,11 @@ make_terminal_frame () f->output_method = output_termcap; f->output_data.x = &tty_display; #else -#ifdef macintosh +#ifdef MAC_OS8 make_mac_terminal_frame (f); #else f->output_data.x = &tty_display; -#endif /* macintosh */ +#endif /* MAC_OS8 */ #endif /* WINDOWSNT */ #endif /* MSDOS */ @@ -521,7 +521,7 @@ Note that changing the size of one terminal frame automatically affects all. */ abort (); #else /* not MSDOS */ -#ifdef macintosh +#ifdef MAC_OS if (sf->output_method != output_mac) error ("Not running on a Macintosh screen; cannot make a new Macintosh frame"); #else @@ -1112,7 +1112,7 @@ frame. The hook is called with one argument FRAME. */) return Qnil; if (NILP (force) && !other_visible_frames (f) -#ifdef macintosh +#ifdef MAC_OS8 /* Terminal frame deleted before any other visible frames are created. */ && strcmp (XSTRING (f->name)->data, "F1") != 0 |