Merge from origin/emacs-24

[gnu-emacs] / src / font.h

diff --git a/src/font.h b/src/font.h
index cffc035cd4915d830328e09bff57296213523fa4..52783419ebeff34abdab727b026eb31709de5ff3 100644 (file)
--- a/src/font.h
+++ b/src/font.h
@@ -570,9 +570,9 @@ struct font_driver
   /* Compute the total metrics of the NGLYPHS glyphs specified by
      the font FONT and the sequence of glyph codes CODE, and store the
      result in METRICS.  */
-  int (*text_extents) (struct font *font,
-                       unsigned *code, int nglyphs,
-                       struct font_metrics *metrics);
+  void (*text_extents) (struct font *font,
+                       unsigned *code, int nglyphs,
+                       struct font_metrics *metrics);
 
 #ifdef HAVE_WINDOW_SYSTEM