* dispextern.h (lookup_non_ascii_face, split_font_name_into_vector)

  (build_font_name_from_vector): Delete externs.

* xfaces.c (struct font_name): Don't declare.

3 files changed, 8 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1df8b2ae032..16e9af14b29 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-16  Juanma Barranquero  <lekktu@gmail.com>
+
+        * dispextern.h (lookup_non_ascii_face, split_font_name_into_vector)
+        (build_font_name_from_vector): Delete externs.
+
+        * xfaces.c (struct font_name): Don't declare.
+
 2008-06-16  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * font.c (font_unparse_gtkname): Use EQ to compare Lisp_Objects.
@@ -1279,7 +1286,7 @@
         change of font-related objects.
         (syms_of_font): Delete "ifdef USE_FONT_BACKEND".  DEFSYM new symbols.
 
-        * fontset.h (struct font_info): Delete it.  Most memnbers go to
+        * fontset.h (struct font_info): Delete it.  Most members go to
         struct font.
         (FONT_ENCODING_NOT_DECIDED): Moved to font.h.
         (enum FONT_SPEC_INDEX): Delete it.
diff --git a/src/dispextern.h b/src/dispextern.h
index 56a1cd45cb7..8ea9ab4c3e5 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2855,7 +2855,6 @@ int ascii_face_of_lisp_face P_ ((struct frame *, int));
 void prepare_face_for_display P_ ((struct frame *, struct face *));
 int xstrcasecmp P_ ((const unsigned char *, const unsigned char *));
 int lookup_face P_ ((struct frame *, Lisp_Object *));
-int lookup_non_ascii_face P_ ((struct frame *, int, struct face *));
 int lookup_named_face P_ ((struct frame *, Lisp_Object, int));
 int lookup_basic_face P_ ((struct frame *, int));
 int smaller_face P_ ((struct frame *, int, int));
@@ -2883,8 +2882,6 @@ void free_realized_face P_ ((struct frame *, struct face *));
 extern Lisp_Object Qforeground_color, Qbackground_color;
 extern Lisp_Object Qframe_set_background_mode;
 extern char unspecified_fg[], unspecified_bg[];
-extern Lisp_Object split_font_name_into_vector P_ ((Lisp_Object));
-extern Lisp_Object build_font_name_from_vector P_ ((Lisp_Object));
 
 extern Lisp_Object Vface_remapping_alist;
 
diff --git a/src/xfaces.c b/src/xfaces.c
index 51da48be48f..15d6e6bcbf6 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -503,7 +503,6 @@ int menu_face_changed_default;
 
 /* Function prototypes.  */
 
-struct font_name;
 struct table_entry;
 struct named_merge_point;