From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Fri, 2 May 2008 09:39:12 +0000 (+0000)
Subject: (Pixmap) [USE_MAC_IMAGE_IO]: New definition for Image I/O.
X-Git-Tag: emacs-pretest-22.2.90~152
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f5d13fd80a641339af86e00ba518ea2d5a6367f2;p=emacs.git

(Pixmap) [USE_MAC_IMAGE_IO]: New definition for Image I/O.
---

diff --git a/src/macgui.h b/src/macgui.h
index c1558e98bfe..3bfea33cffc 100644
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -152,7 +152,18 @@ typedef int Selection;
 #define mac_get_global_mouse	GetGlobalMouse
 #define mac_is_window_toolbar_visible	IsWindowToolbarVisible
 #define mac_rect_make(f, x, y, w, h)	CGRectMake (x, y, w, h)
+
+#if USE_MAC_IMAGE_IO
+typedef struct _XImage
+{
+  int width, height;		/* size of image */
+  char *data;			/* pointer to image data */
+  int bytes_per_line;		/* accelarator to next line */
+  int bits_per_pixel;		/* bits per pixel (ZPixmap) */
+} *Pixmap;
+#else
 typedef GWorldPtr Pixmap;
+#endif
 
 #define Cursor ThemeCursor
 #define No_Cursor (-1)