aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu <[email protected]>2008-07-21 04:21:43 +0000
committerYAMAMOTO Mitsuharu <[email protected]>2008-07-21 04:21:43 +0000
commit83b968264acb13721f22e9b6a538eeb2fe1dfc90 (patch)
tree6413c7eb76d2992ae99238901029f25a9950e5ad /src
parent91b953ac7f8b854010eef0b00bfc12b040abc4ed (diff)
(kCGBitmapByteOrder32Host): New define for non-universal SDKs.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog11
-rw-r--r--src/macterm.h6
2 files changed, 17 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 5604f8080d..1af98cf7dc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2008-07-21 YAMAMOTO Mitsuharu <[email protected]>
+
+ * 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 <[email protected]> (tiny change)
* w32inevt.c: Include dispextern.h. Don't declare change_frame_size
diff --git a/src/macterm.h b/src/macterm.h
index f9e2655a7a..d728a377d0 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;