Merge from emacs--rel--22

[gnu-emacs] / src / macterm.h

diff --git a/src/macterm.h b/src/macterm.h
index 148f073e4ab61ae78375ff32898b25c5c81d1a07..28318a6d0b0cdeaa795a8307eaf2bb07d5482ba8 100644 (file)
--- a/src/macterm.h
+++ b/src/macterm.h
@@ -601,7 +601,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;