Mercurial > emacs
comparison src/s/darwin.h @ 91041:bdb3fe0ba9fa
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 866-879)
- Merge multi-tty branch
- Update from CVS
- Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-257
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 11 Oct 2007 16:22:07 +0000 |
parents | f55f9811f5d7 ccd6d86fd9a6 |
children | 53108e6cea98 |
comparison
equal
deleted
inserted
replaced
91040:14c4a6aac623 | 91041:bdb3fe0ba9fa |
---|---|
48 /* MAC_OS is used to conditionally compile code common to both MAC_OS8 | 48 /* MAC_OS is used to conditionally compile code common to both MAC_OS8 |
49 and MAC_OSX. */ | 49 and MAC_OSX. */ |
50 #ifdef MAC_OSX | 50 #ifdef MAC_OSX |
51 #ifdef HAVE_CARBON | 51 #ifdef HAVE_CARBON |
52 #define MAC_OS | 52 #define MAC_OS |
53 /* We need a little extra space, see ../../lisp/loadup.el. */ | |
54 #define SYSTEM_PURESIZE_EXTRA 30000 | |
55 | |
56 /* XXX The MULTI_KBOARD support does not work yet on this platform. */ | |
57 #undef MULTI_KBOARD | |
58 | |
53 #endif | 59 #endif |
54 #endif | 60 #endif |
55 | 61 |
56 /* SYSTEM_TYPE should indicate the kind of system you are using. | 62 /* SYSTEM_TYPE should indicate the kind of system you are using. |
57 It sets the Lisp variable system-type. */ | 63 It sets the Lisp variable system-type. */ |