Mercurial > emacs

comparison src/macmenu.c @ 89909:68c22ea6027c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Sync to HEAD
author Kenichi Handa <handa@m17n.org>
date Fri, 16 Apr 2004 12:51:06 +0000
parents 375f2633d815
children 4c90ffeb71c5
comparison
equal deleted inserted replaced
89908:ee1402f7b568 89909:68c22ea6027c
33 #include "blockinput.h" 33 #include "blockinput.h"
34 #include "buffer.h" 34 #include "buffer.h"
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>
69 #include <ToolUtils.h> 42 #include <ToolUtils.h>
70 #include <Fonts.h> 43 #include <Fonts.h>
2372 defsubr (&Sx_popup_menu); 2345 defsubr (&Sx_popup_menu);
2373 #ifdef HAVE_MENUS 2346 #ifdef HAVE_MENUS
2374 defsubr (&Sx_popup_dialog); 2347 defsubr (&Sx_popup_dialog);
2375 #endif 2348 #endif
2376 } 2349 }
2350
2351 /* arch-tag: 40b2c6c7-b8a9-4a49-b930-1b2707184cce
2352 (do not change this comment) */