Mercurial > emacs

diff src/s/darwin.h @ 46776:16b6134d7193

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
In src: 2002-07-31 Andrew Choi <akochoi@shaw.ca> * s/darwin.h: Define MAC_OS, SYMS_SYSTEM, and OTHER_FILES only if HAVE_CARBON is defined. In mac: 2002-07-31 Andrew Choi <akochoi@shaw.ca> * INSTALL: Add instructions for building X Window version.
author Andrew Choi <akochoi@shaw.ca>
date Thu, 01 Aug 2002 03:33:20 +0000
parents 474a28fb856c
children eba75fedd593
line wrap: on
line diff
--- a/src/s/darwin.h	Thu Aug 01 03:11:39 2002 +0000
+++ b/src/s/darwin.h	Thu Aug 01 03:33:20 2002 +0000
@@ -40,8 +40,10 @@
 /* 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 @@
 #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 @@
 
 /* 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