(MSDOS_SUPPORT): Remove ccl.elc and codepage.elc.

[gnu-emacs] / src / w32font.h

diff --git a/src/w32font.h b/src/w32font.h
index 60ac62d6e01828c51e1a71cb940613a5bc2d9078..748b329f8da6b6bd538ca613ddda3612612084f8 100644 (file)
--- a/src/w32font.h
+++ b/src/w32font.h
@@ -49,14 +49,16 @@ struct w32_metric_cache
 struct w32font_info
 {
   struct font font;
-  TEXTMETRIC metrics;
+  TEXTMETRICW metrics;
   unsigned int glyph_idx;
   struct w32_metric_cache **cached_metrics;
   int n_cache_blocks;
-  W32FontStruct *compat_w32_font;
+  HFONT hfont;
 };
 
-#define FONT_COMPAT(f) (((struct w32font_info *) (f))->compat_w32_font)
+/* Macros for getting OS specific information from a font struct.  */
+#define FONT_HANDLE(f) (((struct w32font_info *)(f))->hfont)
+#define FONT_TEXTMETRIC(f) (((struct w32font_info *)(f))->metrics)
 
 #define CACHE_BLOCKSIZE 128