# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1168332848 0
# Node ID 17977cca87a67350be7f99cd2b2af11234639edd
# Parent  a567ccd9c91cb742891f0f06cb4837f6c4ea979b
(FONT_MAX_WIDTH): Remove unused macro.
(XCreateGC): Change type in extern.
(XDrawLine): Rename from mac_draw_line_to_pixmap.
(mac_quit_char_key_p) [MAC_OSX]: Add extern.

diff -r a567ccd9c91c -r 17977cca87a6 src/macterm.h
--- a/src/macterm.h	Tue Jan 09 08:53:59 2007 +0000
+++ b/src/macterm.h	Tue Jan 09 08:54:08 2007 +0000
@@ -44,8 +44,6 @@
 #define FONT_BASE(f)    ((f)->ascent)
 #define FONT_DESCENT(f) ((f)->descent)
 
-#define FONT_MAX_WIDTH(f) FONT_WIDTH(f)  /* fix later */
-
 /* Structure recording bitmaps and reference count.
    If REFCOUNT is 0 then this record is free to be reused.  */
 
@@ -617,13 +615,12 @@
 					       unsigned long, unsigned long,
 					       unsigned int));
 extern void XFreePixmap P_ ((Display *, Pixmap));
-extern GC XCreateGC P_ ((Display *, Window, unsigned long, XGCValues *));
+extern GC XCreateGC P_ ((Display *, void *, unsigned long, XGCValues *));
 extern void XFreeGC P_ ((Display *, GC));
 extern void XSetForeground P_ ((Display *, GC, unsigned long));
 extern void XSetBackground P_ ((Display *, GC, unsigned long));
 extern void XSetWindowBackground P_ ((Display *, WindowPtr, unsigned long));
-extern void mac_draw_line_to_pixmap P_ ((Display *, Pixmap, GC, int, int,
-					 int, int));
+extern void XDrawLine P_ ((Display *, Pixmap, GC, int, int, int, int));
 extern void mac_clear_area P_ ((struct frame *, int, int,
 				unsigned int, unsigned int));
 extern void mac_unload_font P_ ((struct mac_display_info *, XFontStruct *));
@@ -639,6 +636,9 @@
 #if USE_CG_DRAWING
 extern void mac_prepare_for_quickdraw P_ ((struct frame *));
 #endif
+#ifdef MAC_OSX
+extern int mac_quit_char_key_p P_ ((UInt32, UInt32));
+#endif
 
 #define FONT_TYPE_FOR_UNIBYTE(font, ch) 0
 #define FONT_TYPE_FOR_MULTIBYTE(font, ch) 0