aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2010-07-23 11:52:32 +0200
committerJuanma Barranquero2010-07-23 11:52:32 +0200
commit97b372d714d73463dcfed2e095238c42005ce162 (patch)
tree1d2a464754acc627d6642b177b731a7e57d9ec54
parentdd86ea1155171345fd2e5bdae2cc2439ab851bc9 (diff)
downloademacs-97b372d714d73463dcfed2e095238c42005ce162.tar.gz
emacs-97b372d714d73463dcfed2e095238c42005ce162.zip
* w32fns.c, xfaces.c: Remove obsolete static declarations.
-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 @@
12010-07-23 Juanma Barranquero <lekktu@gmail.com>
2
3 * w32fns.c (x_edge_detection):
4 * xfaces.c (may_use_scalable_font_p):
5 Remove obsolete static declarations.
6
12010-07-20 Juanma Barranquero <lekktu@gmail.com> 72010-07-20 Juanma Barranquero <lekktu@gmail.com>
2 8
3 * alloc.c (emacs_blocked_free, emacs_blocked_malloc) 9 * 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);
439void x_set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object); 439void x_set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object);
440void x_set_title (struct frame *, Lisp_Object, Lisp_Object); 440void x_set_title (struct frame *, Lisp_Object, Lisp_Object);
441void x_set_tool_bar_lines (struct frame *, Lisp_Object, Lisp_Object); 441void x_set_tool_bar_lines (struct frame *, Lisp_Object, Lisp_Object);
442static void x_edge_detection (struct frame *, struct image *, Lisp_Object,
443 Lisp_Object);
444 442
445 443
446 444
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;
513static void map_tty_color (struct frame *, struct face *, 513static void map_tty_color (struct frame *, struct face *,
514 enum lface_attribute_index, int *); 514 enum lface_attribute_index, int *);
515static Lisp_Object resolve_face_name (Lisp_Object, int); 515static Lisp_Object resolve_face_name (Lisp_Object, int);
516static int may_use_scalable_font_p (const char *);
517static void set_font_frame_param (Lisp_Object, Lisp_Object); 516static void set_font_frame_param (Lisp_Object, Lisp_Object);
518static int get_lface_attributes (struct frame *, Lisp_Object, Lisp_Object *, 517static int get_lface_attributes (struct frame *, Lisp_Object, Lisp_Object *,
519 int, struct named_merge_point *); 518 int, struct named_merge_point *);