Merge from trunk.

[gnu-emacs] / src / font.h

diff --git a/src/font.h b/src/font.h
index 8ca7c9c19c4082ef022852953ea2b649d1e19b3f..72ee15c5e00bd20a60ea7a1ad5701e50a5f41a19 100644 (file)
--- a/src/font.h
+++ b/src/font.h
@@ -793,7 +793,7 @@ extern int font_unparse_fcname (Lisp_Object font, int pixel_size,
 extern void register_font_driver (struct font_driver *driver, FRAME_PTR f);
 extern void free_font_driver_list (FRAME_PTR f);
 extern Lisp_Object font_update_drivers (FRAME_PTR f, Lisp_Object list);
-extern Lisp_Object font_range (EMACS_INT, EMACS_INT *,
+extern Lisp_Object font_range (ptrdiff_t, ptrdiff_t *,
                               struct window *, struct face *,
                               Lisp_Object);
 extern void font_fill_lglyph_metrics (Lisp_Object, Lisp_Object);