diff options
Diffstat (limited to 'src/macmenu.c')
| -rw-r--r-- | src/macmenu.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/macmenu.c b/src/macmenu.c index f98be4f4831..5976dad767d 100644 --- a/src/macmenu.c +++ b/src/macmenu.c | |||
| @@ -46,6 +46,7 @@ Boston, MA 02111-1307, USA. */ | |||
| 46 | precompiled header Carbon.h. */ | 46 | precompiled header Carbon.h. */ |
| 47 | #undef max | 47 | #undef max |
| 48 | #undef min | 48 | #undef min |
| 49 | #undef init_process | ||
| 49 | #include <Carbon/Carbon.h> | 50 | #include <Carbon/Carbon.h> |
| 50 | #undef Z | 51 | #undef Z |
| 51 | #define Z (current_buffer->text->z) | 52 | #define Z (current_buffer->text->z) |
| @@ -59,6 +60,8 @@ Boston, MA 02111-1307, USA. */ | |||
| 59 | #define min(a, b) ((a) < (b) ? (a) : (b)) | 60 | #define min(a, b) ((a) < (b) ? (a) : (b)) |
| 60 | #undef max | 61 | #undef max |
| 61 | #define max(a, b) ((a) > (b) ? (a) : (b)) | 62 | #define max(a, b) ((a) > (b) ? (a) : (b)) |
| 63 | #undef init_process | ||
| 64 | #define init_process emacs_init_process | ||
| 62 | #else /* not MAC_OSX */ | 65 | #else /* not MAC_OSX */ |
| 63 | #include <MacTypes.h> | 66 | #include <MacTypes.h> |
| 64 | #include <Menus.h> | 67 | #include <Menus.h> |