summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog6
-rw-r--r--src/w32fns.c2
-rw-r--r--src/xfaces.c1
3 files changed, 6 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 414f22d3bfd..143b56f2c41 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-23 Juanma Barranquero <lekktu@gmail.com>
+
+ * w32fns.c (x_edge_detection):
+ * xfaces.c (may_use_scalable_font_p):
+ Remove obsolete static declarations.
+
2010-07-20 Juanma Barranquero <lekktu@gmail.com>
* alloc.c (emacs_blocked_free, emacs_blocked_malloc)
diff --git a/src/w32fns.c b/src/w32fns.c
index 57786d76795..c5e555dc884 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -439,8 +439,6 @@ void x_explicitly_set_name (struct frame *, Lisp_Object, Lisp_Object);
void x_set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object);
void x_set_title (struct frame *, Lisp_Object, Lisp_Object);
void x_set_tool_bar_lines (struct frame *, Lisp_Object, Lisp_Object);
-static void x_edge_detection (struct frame *, struct image *, Lisp_Object,
- Lisp_Object);
diff --git a/src/xfaces.c b/src/xfaces.c
index d5aabd40c0c..c0c53f3aa1f 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -513,7 +513,6 @@ struct named_merge_point;
static void map_tty_color (struct frame *, struct face *,
enum lface_attribute_index, int *);
static Lisp_Object resolve_face_name (Lisp_Object, int);
-static int may_use_scalable_font_p (const char *);
static void set_font_frame_param (Lisp_Object, Lisp_Object);
static int get_lface_attributes (struct frame *, Lisp_Object, Lisp_Object *,
int, struct named_merge_point *);