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

[YAMAMOTO Mitsuharu]

Index: emacs/src/image.c
diff -c emacs/src/image.c:1.20 emacs/src/image.c:1.21
*** emacs/src/image.c:1.20      Mon Dec 27 17:27:30 2004
--- emacs/src/image.c   Fri Mar  4 11:07:11 2005
***************
*** 88,102 ****
  #include <alloca.h>
  #include <sys/param.h>
  #endif
  #ifdef MAC_OSX
  #include <QuickTime/QuickTime.h>
! #else /* not MAC_OSX */
  #include <Windows.h>
  #include <Gestalt.h>
  #include <TextUtils.h>
  #include <ImageCompression.h>
  #include <QuickTimeComponents.h>
! #endif /* not MAC_OSX */
  
  /* MAC_TODO : Color tables on Mac.  */
  #undef COLOR_TABLE_SUPPORT
--- 88,106 ----
  #include <alloca.h>
  #include <sys/param.h>
  #endif
+ #if TARGET_API_MAC_CARBON
  #ifdef MAC_OSX
  #include <QuickTime/QuickTime.h>
! #else  /* not MAC_OSX */
! #include <QuickTime.h>
! #endif        /* not MAC_OSX */
! #else  /* not TARGET_API_MAC_CARBON */
  #include <Windows.h>
  #include <Gestalt.h>
  #include <TextUtils.h>
  #include <ImageCompression.h>
  #include <QuickTimeComponents.h>
! #endif        /* not TARGET_API_MAC_CARBON */
  
  /* MAC_TODO : Color tables on Mac.  */
  #undef COLOR_TABLE_SUPPORT