Merge from trunk

1 files changed, 0 insertions, 5 deletions

diff --git a/src/composite.c b/src/composite.c
index 4568698619f..392da1ceba1 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -848,8 +848,6 @@ fill_gstring_header (Lisp_Object header, Lisp_Object start, Lisp_Object end, Lis
   return header;
 }
 
-extern void font_fill_lglyph_metrics (Lisp_Object, Lisp_Object);
-
 static void
 fill_gstring_body (Lisp_Object gstring)
 {
@@ -1939,7 +1937,6 @@ syms_of_composite (void)
   /* Make a hash table for static composition.  */
   {
     Lisp_Object args[6];
-    extern Lisp_Object QCsize;
 
     args[0] = QCtest;
     args[1] = Qequal;
@@ -1959,8 +1956,6 @@ syms_of_composite (void)
   /* Make a hash table for glyph-string.  */
   {
     Lisp_Object args[6];
-    extern Lisp_Object QCsize;
-
     args[0] = QCtest;
     args[1] = Qequal;
     args[2] = QCweakness;