(font_find_for_lface): If registry is NULL, try iso8859-1 and ascii-0.

[bpt/emacs.git] / src / macgui.h

diff --git a/src/macgui.h b/src/macgui.h
index 41ac28f..6b8e560 100644 (file)
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -4,10 +4,10 @@
 
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
@@ -154,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)