From: Dave Love <fx@gnu.org>
Date: Tue, 20 Jun 2000 13:11:39 +0000 (+0000)
Subject: Remove duplicate prototypes.  Declare free_frame_xic,
X-Git-Tag: emacs-pretest-21.0.90~3206
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0385e83ddf5b4cb54bc2ec6e462627f5f753b363;p=emacs.git

Remove duplicate prototypes.  Declare free_frame_xic,
x_set_tool_bar_lines.
---

diff --git a/src/xterm.h b/src/xterm.h
index 65c5bd669f1..51745de0550 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -904,18 +904,6 @@ void x_handle_property_notify P_ ((XPropertyEvent *));
 
 /* From xfns.c.  */
 
-void x_real_positions P_ ((struct frame *, int *, int *));
-void x_destroy_bitmap P_ ((struct frame *, int));
-int x_create_bitmap_from_file P_ ((struct frame *, Lisp_Object));
-int x_create_bitmap_from_data P_ ((struct frame *, char *, unsigned,
-				   unsigned));
-void x_reference_bitmap P_ ((struct frame *, int));
-void x_sync P_ ((struct frame *));
-int x_bitmap_pixmap P_ ((struct frame *, int));
-void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
-int x_bitmap_height P_ ((struct frame *, int));
-int x_bitmap_width P_ ((struct frame *, int));
-int defined_color P_ ((struct frame *, char *, XColor *, int));
 Lisp_Object display_x_get_resource P_ ((struct x_display_info *,
 					Lisp_Object, Lisp_Object,
 					Lisp_Object, Lisp_Object));
@@ -1024,6 +1012,11 @@ extern int x_char_height P_ ((struct frame *));
 extern int x_screen_planes P_ ((struct frame *));
 extern void x_sync P_ ((struct frame *));
 extern enum text_cursor_kinds x_specified_cursor_type P_ ((Lisp_Object, int *));
+extern int x_defined_color P_ ((struct frame *, char *, XColor *, int));
+#ifdef HAVE_X_I18N
+extern void free_frame_xic P_ ((struct frame *));
+#endif
+extern void x_set_tool_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
 
 /* Defined in xfaces.c */