From 9e2a2647758db83b490e2993aa31cd4607305a82 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Sun, 27 Jul 2008 18:24:48 +0000 Subject: Remove support for Mac Carbon. * mactoolbox.c: * macterm.h: * macterm.c: * macselect.c: * macmenu.c: * macgui.h: * macfns.c: * mac.c: Remove file. * s/darwin.h: * m/intel386.h: * xfaces.c: * xdisp.c: * window.c: * tparam.c: * termhooks.h: * termcap.c: * term.c: * syssignal.h: * sysselect.h: * sysdep.c: * process.c: * lread.c: * lisp.h: * keyboard.c: * image.c: * fringe.c: * frame.h: * frame.c: * fontset.c: * font.h: * font.c: * fns.c: * fileio.c: * emacs.c: * dispnew.c: * dispextern.h: * config.in: * atimer.c: * Makefile.in: Remove code for Carbon * erc.el: Remove code for Carbon. Remove support for Mac Carbon. * term/mac-win.el: Remove file * international/mule-cmds.el: * version.el: * startup.el: * simple.el: * mwheel.el: * mouse.el: * loadup.el: * isearch.el: * info.el: * frame.el: * faces.el: * disp-table.el: * cus-start.el: * cus-face.el: * cus-edit.el: * Makefile.in: Remove code for Carbon. Remove support for Mac Carbon. * makefile.w32-in: * emacsclient.c: Remove code for Carbon. * PROBLEMS: * MACHINES: Remove mentions of Mac Carbon. * ns-emacs.texi: * faq.texi: Remove mentions of Mac Carbon. * os.texi: * frames.texi: * display.texi: Remove mentions of Mac Carbon. * xresources.texi: Remove mentions of Mac Carbon. * make-tarball.txt: * admin.el: * FOR-RELEASE: * CPP-DEFINES: Remove mentions of Mac Carbon. Remove support for Mac Carbon. * mac: Remove directory. * make-dist: * configure.in: * README: * Makefile.in: * INSTALL: Remove code for Carbon. * configure: Regenerate. --- src/s/darwin.h | 61 ++++------------------------------------------------------ 1 file changed, 4 insertions(+), 57 deletions(-) (limited to 'src/s') diff --git a/src/s/darwin.h b/src/s/darwin.h index 3c227afe621..42406a4d559 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h @@ -27,14 +27,6 @@ along with GNU Emacs. If not, see . */ /* BSD4_3 and BSD4_4 are already defined in sys/param.h */ #define BSD_SYSTEM -/* MAC_OS is used to conditionally compile code common to both MAC_OS8 - and MAC_OSX. */ -#ifdef MAC_OSX -#ifdef HAVE_CARBON -#define MAC_OS -#endif -#endif - /* SYSTEM_TYPE should indicate the kind of system you are using. It sets the Lisp variable system-type. */ @@ -133,20 +125,12 @@ along with GNU Emacs. If not, see . */ /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */ #define HAVE_SOCKETS -/* In Carbon, asynchronous I/O (using SIGIO) can't be used for window - events because they don't come from sockets, even though it works - fine on tty's. */ /* This seems to help in Ctrl-G detection under Cocoa, however at the cost of some quirks that may or may not bother a given user. */ -#if defined (HAVE_CARBON) || defined (COCOA_EXPERIMENTAL_CTRL_G) +#if defined (COCOA_EXPERIMENTAL_CTRL_G) #define NO_SOCK_SIGIO #endif -/* Extra initialization calls in main for Mac OS X system type. */ -#ifdef HAVE_CARBON -#define SYMS_SYSTEM syms_of_mac() -#endif - /* Definitions for how to dump. Copied from nextstep.h. */ #define UNEXEC unexmacosx.o @@ -158,7 +142,7 @@ along with GNU Emacs. If not, see . */ /* Definitions for how to compile & link. */ -/* Link in the Carbon or AppKit lib. */ +/* Link in the AppKit lib. */ #ifdef HAVE_NS /* PENDING: can this target be specified in a clearer way? */ #define OTHER_FILES ns-app @@ -170,49 +154,12 @@ along with GNU Emacs. If not, see . */ #else /* !HAVE_NS */ #define HEADERPAD_EXTRA 690 -/* This is for the Carbon port. Under the NeXTstep port, this is still picked +/* FIXME: Is this needed? + This is for the Carbon port. Under the NeXTstep port, this is still picked up during preprocessing, but is undone in config.in. */ #define C_SWITCH_SYSTEM -fpascal-strings -DMAC_OSX -#ifdef HAVE_CARBON - -/* We need a little extra space, see ../../lisp/loadup.el. */ -#define SYSTEM_PURESIZE_EXTRA 30000 - -/* Link in the Carbon lib. */ -#define LIBS_MACGUI -framework Carbon LIBS_IMAGE - -#ifdef HAVE_AVAILABILITYMACROS_H -#include -#endif -/* Tell src/Makefile.in to create files in the Mac OS X application - bundle mac/Emacs.app. */ -#define OTHER_FILES macosx-app - -/* Whether to use the Image I/O framework for reading images. */ -#ifndef USE_MAC_IMAGE_IO -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040 && (MAC_OS_X_VERSION_MIN_REQUIRED >= 1040 || MAC_OS_X_VERSION_MIN_REQUIRED < 1020) -#define USE_MAC_IMAGE_IO 1 -#endif -#endif - -/* If the Image I/O framework is not used, fall back on QuickTime. */ -#if USE_MAC_IMAGE_IO -#define LIBS_IMAGE -#else -#define LIBS_IMAGE -framework QuickTime -#endif - -/* Reroute calls to SELECT to the version defined in mac.c to fix the - problem of Emacs requiring an extra return to be typed to start - working when started from the command line. */ -#if defined (emacs) || defined (temacs) -#define select sys_select -#endif - -#else /* !HAVE_CARBON */ #define LIBS_MACGUI -#endif /* HAVE_CARBON */ #endif /* !HAVE_NS */ -- cgit v1.2.1