[Emacs-diffs] Changes to emacs/src/macmenu.c

[YAMAMOTO Mitsuharu]

Index: emacs/src/macmenu.c
diff -c emacs/src/macmenu.c:1.22 emacs/src/macmenu.c:1.23
*** emacs/src/macmenu.c:1.22    Fri Dec  3 17:00:11 2004
--- emacs/src/macmenu.c Fri Mar  4 11:09:33 2005
***************
*** 35,41 ****
  #include "charset.h"
  #include "coding.h"
  
! #ifndef MAC_OSX
  #include <MacTypes.h>
  #include <Menus.h>
  #include <QuickDraw.h>
--- 35,41 ----
  #include "charset.h"
  #include "coding.h"
  
! #if !TARGET_API_MAC_CARBON
  #include <MacTypes.h>
  #include <Menus.h>
  #include <QuickDraw.h>
***************
*** 47,53 ****
  #if defined (__MRC__) || (__MSL__ >= 0x6000)
  #include <ControlDefinitions.h>
  #endif
! #endif /* not MAC_OSX */
  
  /* This may include sys/types.h, and that somehow loses
     if this is not done before the other system files.  */
--- 47,53 ----
  #if defined (__MRC__) || (__MSL__ >= 0x6000)
  #include <ControlDefinitions.h>
  #endif
! #endif /* not TARGET_API_MAC_CARBON */
  
  /* This may include sys/types.h, and that somehow loses
     if this is not done before the other system files.  */