From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Mon, 21 Jul 2008 04:20:49 +0000 (+0000)
Subject: (XDrawLine, XCreatePixmapFromBitmapData) [USE_MAC_IMAGE_IO]:
X-Git-Tag: emacs-pretest-22.2.90~99
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=91b953ac7f8b854010eef0b00bfc12b040abc4ed;p=emacs.git

(XDrawLine, XCreatePixmapFromBitmapData) [USE_MAC_IMAGE_IO]:
Remove conditionals for kCGBitmapByteOrder32Host.
---

diff --git a/src/macterm.c b/src/macterm.c
index 43fcfd514cf..f73050788c2 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -415,11 +415,7 @@ XDrawLine (display, p, gc, x1, y1, x2, y2)
   if (ximg->bits_per_pixel == 32)
     {
       color_space = mac_cg_color_space_rgb;
-      alpha_info = (kCGImageAlphaNoneSkipFirst
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040
-		    | kCGBitmapByteOrder32Host
-#endif
-		    );
+      alpha_info = kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Host;
     }
   else
     {
@@ -748,10 +744,7 @@ XCreatePixmapFromBitmapData (display, w, data, width, height, fg, bg, depth)
 				   pixmap->bytes_per_line,
 				   mac_cg_color_space_rgb,
 				   kCGImageAlphaNoneSkipFirst
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040
-				   | kCGBitmapByteOrder32Host
-#endif
-				   );
+				   | kCGBitmapByteOrder32Host);
 
   CG_SET_FILL_COLOR (context, fg);
   CGContextFillRect (context, CGRectMake (0, 0, width, height));