Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1142

1 files changed, 11 insertions, 0 deletions

diff --git a/src/macgui.h b/src/macgui.h
index 41ac28f49ec..9d4eb0ed9f4 100644
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -154,7 +154,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)