/[emacs]/emacs/src/dispextern.h
ViewVC logotype

Diff of /emacs/src/dispextern.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.150 by kfstorm, Fri Mar 21 23:08:04 2003 UTC revision 1.151 by akochoi, Mon Mar 24 19:59:08 2003 UTC
# Line 58  typedef struct x_display_info Display_In Line 58  typedef struct x_display_info Display_In
58  typedef struct w32_display_info Display_Info;  typedef struct w32_display_info Display_Info;
59  #endif  #endif
60    
61  #ifdef MAC_OS  #ifdef HAVE_CARBON
62  #include "macgui.h"  #include "macgui.h"
63  typedef struct mac_display_info Display_Info;  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  #endif
94    
95    

Legend:
Removed from v.1.150  
changed lines
  Added in v.1.151

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26