diff options
Diffstat (limited to 'src/macmenu.c')
| -rw-r--r-- | src/macmenu.c | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/src/macmenu.c b/src/macmenu.c index 72fb95fbaa9..06b1b16cf41 100644 --- a/src/macmenu.c +++ b/src/macmenu.c @@ -35,34 +35,7 @@ Boston, MA 02111-1307, USA. */ #include "charset.h" #include "coding.h" -#ifdef MAC_OSX -#undef mktime -#undef DEBUG -#undef Z -#undef free -#undef malloc -#undef realloc -/* Macros max and min defined in lisp.h conflict with those in - precompiled header Carbon.h. */ -#undef max -#undef min -#undef init_process -#include <Carbon/Carbon.h> -#undef Z -#define Z (current_buffer->text->z) -#undef free -#define free unexec_free -#undef malloc -#define malloc unexec_malloc -#undef realloc -#define realloc unexec_realloc -#undef min -#define min(a, b) ((a) < (b) ? (a) : (b)) -#undef max -#define max(a, b) ((a) > (b) ? (a) : (b)) -#undef init_process -#define init_process emacs_init_process -#else /* not MAC_OSX */ +#ifndef MAC_OSX #include <MacTypes.h> #include <Menus.h> #include <QuickDraw.h> @@ -2374,3 +2347,6 @@ The enable predicate for a menu command should check this variable. */); defsubr (&Sx_popup_dialog); #endif } + +/* arch-tag: 40b2c6c7-b8a9-4a49-b930-1b2707184cce + (do not change this comment) */ |