# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1047847790 0
# Node ID 4f45129dc10ef74d3c6a90799f685dee45964ee1
# Parent  203d5a0f77a8df2bac53e3231fa2989bc1beddd6
(FRAME_X_OUTPUT, FRAME_X_WINDOW, FRAME_X_DISPLAY):
(FONT_TYPE_FOR_UNIBYTE, FONT_TYPE_FOR_MULTIBYTE): New macros for
consolidation.

diff -r 203d5a0f77a8 -r 4f45129dc10e src/macterm.h
--- a/src/macterm.h	Sun Mar 16 20:48:56 2003 +0000
+++ b/src/macterm.h	Sun Mar 16 20:49:50 2003 +0000
@@ -402,8 +402,12 @@
 
 typedef struct mac_output mac_output;
 
+/* Return the X output data for frame F.  */
+#define FRAME_X_OUTPUT(f) ((f)->output_data.mac)
+
 /* Return the Mac window used for displaying data in frame F.  */
 #define FRAME_MAC_WINDOW(f) ((f)->output_data.mac->mWP)
+#define FRAME_X_WINDOW(f) ((f)->output_data.mac->mWP)
 
 #define FRAME_FOREGROUND_PIXEL(f) ((f)->output_data.x->foreground_pixel)
 #define FRAME_BACKGROUND_PIXEL(f) ((f)->output_data.x->background_pixel)
@@ -426,6 +430,7 @@
 
 /* This is the `Display *' which frame F is on.  */
 #define FRAME_MAC_DISPLAY(f) (0)
+#define FRAME_X_DISPLAY(f) (0)
 
 /* This is the 'font_info *' which frame F has.  */
 #define FRAME_MAC_FONT_TABLE(f) (FRAME_MAC_DISPLAY_INFO (f)->font_table)
@@ -648,3 +653,6 @@
 
 struct frame * check_x_frame (Lisp_Object);
 
+#define FONT_TYPE_FOR_UNIBYTE(font, ch) 0
+#define FONT_TYPE_FOR_MULTIBYTE(font, ch) 0
+