diff options
author | Andrew Choi <[email protected]> | 2002-08-01 03:33:20 +0000 |
---|---|---|
committer | Andrew Choi <[email protected]> | 2002-08-01 03:33:20 +0000 |
commit | 9794a8cdaddaff840dcad5108348b0e5ebc8d087 (patch) | |
tree | 2b598a431c4a51eebd9e2c730fc94ffc50cfa377 /src/s/darwin.h | |
parent | 4312a2617f47147820494f73d3e63aaedb458538 (diff) |
In src:
2002-07-31 Andrew Choi <[email protected]>
* s/darwin.h: Define MAC_OS, SYMS_SYSTEM, and OTHER_FILES only if
HAVE_CARBON is defined.
In mac:
2002-07-31 Andrew Choi <[email protected]>
* INSTALL: Add instructions for building X Window version.
Diffstat (limited to 'src/s/darwin.h')
-rw-r--r-- | src/s/darwin.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/s/darwin.h b/src/s/darwin.h index 59f63f5718..a4b3b72753 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h @@ -40,8 +40,10 @@ Boston, MA 02111-1307, USA. */ /* 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. */ @@ -222,7 +224,9 @@ Boston, MA 02111-1307, USA. */ #define HAVE_SOCKETS /* 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. */ @@ -271,7 +275,9 @@ Boston, MA 02111-1307, USA. */ /* Tell src/Makefile.in to create files in the Mac OS X application bundle mac/Emacs.app. */ +#ifdef HAVE_CARBON #define OTHER_FILES macosx-app +#endif /* Define the following so emacs symbols will not conflict with those |