From 83b968264acb13721f22e9b6a538eeb2fe1dfc90 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Mon, 21 Jul 2008 04:21:43 +0000 Subject: [PATCH] (kCGBitmapByteOrder32Host): New define for non-universal SDKs. --- src/ChangeLog | 11 +++++++++++ src/macterm.h | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 5604f8080d0..1af98cf7dc0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,14 @@ +2008-07-21 YAMAMOTO Mitsuharu + + * macterm.h (kCGBitmapByteOrder32Host): New define for + non-universal SDKs. + + * image.c (mac_create_cg_image_from_image, image_load_image_io) + [USE_MAC_IMAGE_IO]: Remove conditionals for kCGBitmapByteOrder32Host. + + * macterm.c (XDrawLine, XCreatePixmapFromBitmapData) [USE_MAC_IMAGE_IO]: + Remove conditionals for kCGBitmapByteOrder32Host. + 2008-07-18 David Robinow (tiny change) * w32inevt.c: Include dispextern.h. Don't declare change_frame_size diff --git a/src/macterm.h b/src/macterm.h index f9e2655a7a2..d728a377d08 100644 --- a/src/macterm.h +++ b/src/macterm.h @@ -611,7 +611,13 @@ enum { kEventParamWindowMouseLocation = 'wmou' }; #endif + +/* kCGBitmapByteOrder32Host is defined in Universal SDK for 10.4 but + not in PPC SDK for 10.4.0. */ +#if MAC_OS_X_VERSION_MAX_ALLOWED < 1050 && !defined (kCGBitmapByteOrder32Host) +#define kCGBitmapByteOrder32Host 0 #endif +#endif /* MAC_OSX */ struct frame; struct face; -- 2.39.5