diff options
Diffstat (limited to 'src/macmenu.c')
| -rw-r--r-- | src/macmenu.c | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/src/macmenu.c b/src/macmenu.c index 0a6747896b6..06b1b16cf41 100644 --- a/src/macmenu.c +++ b/src/macmenu.c | |||
| @@ -35,34 +35,7 @@ Boston, MA 02111-1307, USA. */ | |||
| 35 | #include "charset.h" | 35 | #include "charset.h" |
| 36 | #include "coding.h" | 36 | #include "coding.h" |
| 37 | 37 | ||
| 38 | #ifdef MAC_OSX | 38 | #ifndef MAC_OSX |
| 39 | #undef mktime | ||
| 40 | #undef DEBUG | ||
| 41 | #undef Z | ||
| 42 | #undef free | ||
| 43 | #undef malloc | ||
| 44 | #undef realloc | ||
| 45 | /* Macros max and min defined in lisp.h conflict with those in | ||
| 46 | precompiled header Carbon.h. */ | ||
| 47 | #undef max | ||
| 48 | #undef min | ||
| 49 | #undef init_process | ||
| 50 | #include <Carbon/Carbon.h> | ||
| 51 | #undef Z | ||
| 52 | #define Z (current_buffer->text->z) | ||
| 53 | #undef free | ||
| 54 | #define free unexec_free | ||
| 55 | #undef malloc | ||
| 56 | #define malloc unexec_malloc | ||
| 57 | #undef realloc | ||
| 58 | #define realloc unexec_realloc | ||
| 59 | #undef min | ||
| 60 | #define min(a, b) ((a) < (b) ? (a) : (b)) | ||
| 61 | #undef max | ||
| 62 | #define max(a, b) ((a) > (b) ? (a) : (b)) | ||
| 63 | #undef init_process | ||
| 64 | #define init_process emacs_init_process | ||
| 65 | #else /* not MAC_OSX */ | ||
| 66 | #include <MacTypes.h> | 39 | #include <MacTypes.h> |
| 67 | #include <Menus.h> | 40 | #include <Menus.h> |
| 68 | #include <QuickDraw.h> | 41 | #include <QuickDraw.h> |