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

[Steven Tamm]

Index: emacs/src/dispextern.h
diff -c emacs/src/dispextern.h:1.188 emacs/src/dispextern.h:1.189
*** emacs/src/dispextern.h:1.188        Tue Nov 23 00:51:55 2004
--- emacs/src/dispextern.h      Mon Dec 27 17:27:29 2004
***************
*** 62,68 ****
  typedef HDC XImagePtr_or_DC;
  #endif
  
! #ifdef HAVE_CARBON
  #include "macgui.h"
  typedef struct mac_display_info Display_Info;
  /* Mac equivalent of XImage.  */
--- 62,68 ----
  typedef HDC XImagePtr_or_DC;
  #endif
  
! #ifdef MAC_OS
  #include "macgui.h"
  typedef struct mac_display_info Display_Info;
  /* Mac equivalent of XImage.  */
***************
*** 1171,1177 ****
    unsigned for_overlaps_p : 1;
  
    /* The GC to use for drawing this glyph string.  */
! #if defined(HAVE_X_WINDOWS) || defined(HAVE_CARBON)
    GC gc;
  #endif
  #if defined(HAVE_NTGUI)
--- 1171,1177 ----
    unsigned for_overlaps_p : 1;
  
    /* The GC to use for drawing this glyph string.  */
! #if defined(HAVE_X_WINDOWS) || defined(MAC_OS)
    GC gc;
  #endif
  #if defined(HAVE_NTGUI)