Merge from trunk.

[gnu-emacs] / src / font.h

diff --git a/src/font.h b/src/font.h
index 0ca9e8baec48ebb779ed7c568596b4f48a0c2e08..e50eaff9a1fb5fc9b68b0124796abcabea1908d1 100644 (file)
--- a/src/font.h
+++ b/src/font.h
@@ -777,7 +777,8 @@ extern void font_done_for_face (FRAME_PTR f, struct face *face);
 extern Lisp_Object font_open_by_spec (FRAME_PTR f, Lisp_Object spec);
 extern Lisp_Object font_open_by_name (FRAME_PTR f, const char *name);
 
-extern Lisp_Object font_intern_prop (const char *str, int len, int force_symbol);
+extern Lisp_Object font_intern_prop (const char *str, ptrdiff_t len,
+                                    int force_symbol);
 extern void font_update_sort_order (int *order);
 
 extern void font_parse_family_registry (Lisp_Object family,