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

Diff of /emacs/src/macgui.h

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

revision 1.13 by tamm, Mon Jan 24 17:59:36 2005 UTC revision 1.14 by mituharu, Fri Mar 4 11:09:09 2005 UTC
# Line 29  typedef char * XrmDatabase;  /* fix late Line 29  typedef char * XrmDatabase;  /* fix late
29    
30  typedef unsigned long Time;  typedef unsigned long Time;
31    
32  #if MAC_OSX  #ifdef HAVE_CARBON
33    #undef Z
34    #ifdef MAC_OSX
35  #undef mktime  #undef mktime
36  #undef DEBUG  #undef DEBUG
 #undef Z  
37  #undef free  #undef free
38  #undef malloc  #undef malloc
39  #undef realloc  #undef realloc
# Line 44  typedef unsigned long Time; Line 45  typedef unsigned long Time;
45  #include <Carbon/Carbon.h>  #include <Carbon/Carbon.h>
46  #undef mktime  #undef mktime
47  #define mktime emacs_mktime  #define mktime emacs_mktime
 #undef Z  
 #define Z (current_buffer->text->z)  
48  #undef free  #undef free
49  #define free unexec_free  #define free unexec_free
50  #undef malloc  #undef malloc
# Line 59  typedef unsigned long Time; Line 58  typedef unsigned long Time;
58  #undef init_process  #undef init_process
59  #define init_process emacs_init_process  #define init_process emacs_init_process
60  #undef INFINITY  #undef INFINITY
61  #else  #else  /* not MAC_OSX */
62    #undef SIGHUP
63    #define OLDP2C 1
64    #include <Carbon.h>
65    #endif  /* not MAC_OSX */
66    #undef Z
67    #define Z (current_buffer->text->z)
68    #else /* not HAVE_CARBON */
69  #include <QuickDraw.h>          /* for WindowPtr */  #include <QuickDraw.h>          /* for WindowPtr */
70  #include <QDOffscreen.h>        /* for GWorldPtr */  #include <QDOffscreen.h>        /* for GWorldPtr */
71  #include <Windows.h>  #include <Windows.h>
72  #include <Gestalt.h>  #include <Gestalt.h>
73  #endif  #endif /* not HAVE_CARBON */
74    
75  typedef WindowPtr Window;  typedef WindowPtr Window;
76  typedef GWorldPtr Pixmap;  typedef GWorldPtr Pixmap;

Legend:
Removed from v.1.13  
changed lines
  Added in v.1.14

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