* xfaces.c (tty_defined_color, merge_face_heights): Now static.

diff --git a/src/ChangeLog b/src/ChangeLog
index c6f973a..1f8e0f6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
 
        * xfaces.c (clear_face_cache, Fx_list_fonts, Fface_font): Rename
        or move locals to avoid shadowing.
+       (tty_defined_color, merge_face_heights): Now static.
 
        * terminal.c (store_terminal_param): Now static.
 

diff --git a/src/xfaces.c b/src/xfaces.c
index d877d85..d463175 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -1112,7 +1112,7 @@ tty_lookup_color (struct frame *f, Lisp_Object color, XColor *tty_color, XColor
 
 /* A version of defined_color for non-X frames.  */
 
-int
+static int
 tty_defined_color (struct frame *f, const char *color_name,
                   XColor *color_def, int alloc)
 {
@@ -2251,7 +2251,7 @@ set_lface_from_font (struct frame *f, Lisp_Object lface, Lisp_Object font_object
    `relative' heights; the returned value is always an absolute height
    unless both FROM and TO are relative.  */
 
-Lisp_Object
+static Lisp_Object
 merge_face_heights (Lisp_Object from, Lisp_Object to, Lisp_Object invalid)
 {
   Lisp_Object result = invalid;