* font.c (font_update_drivers): Fix mistake in reconstructing the

[gnu-emacs] / src / w32font.h

diff --git a/src/w32font.h b/src/w32font.h
index 60ac62d6e01828c51e1a71cb940613a5bc2d9078..180a5b873ba6532ce6adb2b2dc426f8352173eae 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
 
@@ -79,6 +81,8 @@ int w32font_draw P_ ((struct glyph_string *s, int from, int to,
 
 int uniscribe_check_otf P_ ((LOGFONT *font, Lisp_Object otf_spec));
 
+Lisp_Object intern_font_name P_ ((char *));
+
 #endif
 
 /* arch-tag: ef9d9675-a2a5-4d01-9526-815e9a3da7cb