[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/dispextern.h
From: |
Andrew Choi |
Subject: |
[Emacs-diffs] Changes to emacs/src/dispextern.h |
Date: |
Mon, 24 Mar 2003 14:59:09 -0500 |
Index: emacs/src/dispextern.h
diff -c emacs/src/dispextern.h:1.150 emacs/src/dispextern.h:1.151
*** emacs/src/dispextern.h:1.150 Fri Mar 21 18:08:04 2003
--- emacs/src/dispextern.h Mon Mar 24 14:59:08 2003
***************
*** 58,66 ****
typedef struct w32_display_info Display_Info;
#endif
! #ifdef MAC_OS
#include "macgui.h"
typedef struct mac_display_info Display_Info;
#endif
--- 58,95 ----
typedef struct w32_display_info Display_Info;
#endif
! #ifdef HAVE_CARBON
#include "macgui.h"
typedef struct mac_display_info Display_Info;
+
+ /* Include Carbon.h to define Cursor and Rect. */
+ #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
+
#endif
- [Emacs-diffs] Changes to emacs/src/dispextern.h, Kim F. Storm, 2003/03/12
- [Emacs-diffs] Changes to emacs/src/dispextern.h, Kim F. Storm, 2003/03/16
- [Emacs-diffs] Changes to emacs/src/dispextern.h, Kim F. Storm, 2003/03/18
- [Emacs-diffs] Changes to emacs/src/dispextern.h, Kim F. Storm, 2003/03/21
- [Emacs-diffs] Changes to emacs/src/dispextern.h, Kim F. Storm, 2003/03/21
- [Emacs-diffs] Changes to emacs/src/dispextern.h, Kim F. Storm, 2003/03/21
- [Emacs-diffs] Changes to emacs/src/dispextern.h, Kim F. Storm, 2003/03/21
- [Emacs-diffs] Changes to emacs/src/dispextern.h,
Andrew Choi <=
- [Emacs-diffs] Changes to emacs/src/dispextern.h, Kim F. Storm, 2003/03/31