Mercurial > emacs
comparison src/dispextern.h @ 54150:6c8849d06ab3
Inserting Yamomotosan's changes for MacOSX image support, better support
of Asian fonts, and some long awaited header cleanup and centralization.
author | Steven Tamm <steventamm@mac.com> |
---|---|
date | Thu, 26 Feb 2004 17:46:48 +0000 |
parents | 8970999f9bcc |
children | 02a264d3657d 887bb2eb4a89 |
comparison
equal
deleted
inserted
replaced
54149:6065441e9610 | 54150:6c8849d06ab3 |
---|---|
59 #endif | 59 #endif |
60 | 60 |
61 #ifdef HAVE_CARBON | 61 #ifdef HAVE_CARBON |
62 #include "macgui.h" | 62 #include "macgui.h" |
63 typedef struct mac_display_info Display_Info; | 63 typedef struct mac_display_info Display_Info; |
64 | |
65 /* Include Carbon.h to define Cursor and Rect. */ | |
66 #undef mktime | |
67 #undef DEBUG | |
68 #undef Z | |
69 #undef free | |
70 #undef malloc | |
71 #undef realloc | |
72 /* Macros max and min defined in lisp.h conflict with those in | |
73 precompiled header Carbon.h. */ | |
74 #undef max | |
75 #undef min | |
76 #undef init_process | |
77 #include <Carbon/Carbon.h> | |
78 #undef Z | |
79 #define Z (current_buffer->text->z) | |
80 #undef free | |
81 #define free unexec_free | |
82 #undef malloc | |
83 #define malloc unexec_malloc | |
84 #undef realloc | |
85 #define realloc unexec_realloc | |
86 #undef min | |
87 #define min(a, b) ((a) < (b) ? (a) : (b)) | |
88 #undef max | |
89 #define max(a, b) ((a) > (b) ? (a) : (b)) | |
90 #undef init_process | |
91 #define init_process emacs_init_process | |
92 | |
93 #endif | 64 #endif |
94 | |
95 | 65 |
96 #ifndef NativeRectangle | 66 #ifndef NativeRectangle |
97 #define NativeRectangle int | 67 #define NativeRectangle int |
98 #endif | 68 #endif |
99 | 69 |