diff options
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 6 | ||||
| -rw-r--r-- | lib-src/emacsclient.c | 2 | ||||
| -rw-r--r-- | lib-src/makefile.w32-in | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index c56b3ec405f..375b5e332a3 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,9 @@ +2008-07-27 Dan Nicolaescu <dann@ics.uci.edu> + + Remove support for Mac Carbon. + * makefile.w32-in: + * emacsclient.c: Remove code for Carbon. + 2008-07-21 Dan Nicolaescu <dann@ics.uci.edu> * Makefile.in (mac-fix-env): Remove #ifdef around rule. diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index ef146699781..279dd40b864 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -569,7 +569,7 @@ decode_options (argc, argv) if (!tty && display) window_system = 1; -#if !defined (WINDOWSNT) && !defined (HAVE_CARBON) +#if !defined (WINDOWSNT) else if (!current_frame) tty = 1; #endif diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index abd3fa5a9be..4a9bbb5fbe8 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@ -143,7 +143,7 @@ $(BLD)/ctags.$(O): ctags.c # obj = dosfns.o msdos.o \ xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ - mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o \ + fontset.o \ w32.o w32console.o w32fns.o w32heap.o w32inevt.o \ w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \ font.o w32font.o \ |