[Emacs-diffs] Changes to emacs/src/macgui.h

[YAMAMOTO Mitsuharu]

Index: emacs/src/macgui.h
diff -c emacs/src/macgui.h:1.13 emacs/src/macgui.h:1.14
*** emacs/src/macgui.h:1.13     Mon Jan 24 17:59:36 2005
--- emacs/src/macgui.h  Fri Mar  4 11:09:09 2005
***************
*** 29,38 ****
  
  typedef unsigned long Time;
  
! #if MAC_OSX
  #undef mktime
  #undef DEBUG
- #undef Z
  #undef free
  #undef malloc
  #undef realloc
--- 29,39 ----
  
  typedef unsigned long Time;
  
! #ifdef HAVE_CARBON
! #undef Z
! #ifdef MAC_OSX
  #undef mktime
  #undef DEBUG
  #undef free
  #undef malloc
  #undef realloc
***************
*** 44,51 ****
  #include <Carbon/Carbon.h>
  #undef mktime
  #define mktime emacs_mktime
- #undef Z
- #define Z (current_buffer->text->z)
  #undef free
  #define free unexec_free
  #undef malloc
--- 45,50 ----
***************
*** 59,70 ****
  #undef init_process
  #define init_process emacs_init_process
  #undef INFINITY
! #else
  #include <QuickDraw.h>                /* for WindowPtr */
  #include <QDOffscreen.h>      /* for GWorldPtr */
  #include <Windows.h>
  #include <Gestalt.h>
! #endif
  
  typedef WindowPtr Window;
  typedef GWorldPtr Pixmap;
--- 58,76 ----
  #undef init_process
  #define init_process emacs_init_process
  #undef INFINITY
! #else  /* not MAC_OSX */
! #undef SIGHUP
! #define OLDP2C 1
! #include <Carbon.h>
! #endif  /* not MAC_OSX */
! #undef Z
! #define Z (current_buffer->text->z)
! #else /* not HAVE_CARBON */
  #include <QuickDraw.h>                /* for WindowPtr */
  #include <QDOffscreen.h>      /* for GWorldPtr */
  #include <Windows.h>
  #include <Gestalt.h>
! #endif /* not HAVE_CARBON */
  
  typedef WindowPtr Window;
  typedef GWorldPtr Pixmap;