(MacFontStruct): Remove member `fontname'. Add member `full_name'.

[TARGET_API_MAC_CARBON] (MacFontStruct): Use type int for
mac_scriptcode member.

diff --git a/src/macgui.h b/src/macgui.h
index 96fd54a603baa4ac4223c0357076dd051bd81a54..5d4f1894e2eaa3260015dbfcb2809f6514cf82bd 100644 (file)
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -101,12 +101,16 @@ typedef struct _XCharStruct
    (xcs).descent = (bds).bottom)
 
 struct MacFontStruct {
-  char *fontname;
+  char *full_name;
 
   short mac_fontnum;  /* font number of font used in this window */
   int mac_fontsize;  /* size of font */
   short mac_fontface;  /* plain, bold, italics, etc. */
+#if TARGET_API_MAC_CARBON
+  int mac_scriptcode;  /* Mac OS script code for font used */
+#else
   short mac_scriptcode;  /* Mac OS script code for font used */
+#endif
 
 #if 0
   SInt16 mFontNum;  /* font number of font used in this window */