aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDave Love2000-06-20 13:11:39 +0000
committerDave Love2000-06-20 13:11:39 +0000
commit0385e83ddf5b4cb54bc2ec6e462627f5f753b363 (patch)
tree4890a6441ef87196aa534bd916d78dbb72954d1c /src
parent83925baabc72bcc05aefe9124fb768a3de60a33a (diff)
downloademacs-0385e83ddf5b4cb54bc2ec6e462627f5f753b363.tar.gz
emacs-0385e83ddf5b4cb54bc2ec6e462627f5f753b363.zip
Remove duplicate prototypes. Declare free_frame_xic,
x_set_tool_bar_lines.
Diffstat (limited to 'src')
-rw-r--r--src/xterm.h17
1 files changed, 5 insertions, 12 deletions
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 *));
904 904
905/* From xfns.c. */ 905/* From xfns.c. */
906 906
907void x_real_positions P_ ((struct frame *, int *, int *));
908void x_destroy_bitmap P_ ((struct frame *, int));
909int x_create_bitmap_from_file P_ ((struct frame *, Lisp_Object));
910int x_create_bitmap_from_data P_ ((struct frame *, char *, unsigned,
911 unsigned));
912void x_reference_bitmap P_ ((struct frame *, int));
913void x_sync P_ ((struct frame *));
914int x_bitmap_pixmap P_ ((struct frame *, int));
915void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
916int x_bitmap_height P_ ((struct frame *, int));
917int x_bitmap_width P_ ((struct frame *, int));
918int defined_color P_ ((struct frame *, char *, XColor *, int));
919Lisp_Object display_x_get_resource P_ ((struct x_display_info *, 907Lisp_Object display_x_get_resource P_ ((struct x_display_info *,
920 Lisp_Object, Lisp_Object, 908 Lisp_Object, Lisp_Object,
921 Lisp_Object, Lisp_Object)); 909 Lisp_Object, Lisp_Object));
@@ -1024,6 +1012,11 @@ extern int x_char_height P_ ((struct frame *));
1024extern int x_screen_planes P_ ((struct frame *)); 1012extern int x_screen_planes P_ ((struct frame *));
1025extern void x_sync P_ ((struct frame *)); 1013extern void x_sync P_ ((struct frame *));
1026extern enum text_cursor_kinds x_specified_cursor_type P_ ((Lisp_Object, int *)); 1014extern enum text_cursor_kinds x_specified_cursor_type P_ ((Lisp_Object, int *));
1015extern int x_defined_color P_ ((struct frame *, char *, XColor *, int));
1016#ifdef HAVE_X_I18N
1017extern void free_frame_xic P_ ((struct frame *));
1018#endif
1019extern void x_set_tool_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
1027 1020
1028/* Defined in xfaces.c */ 1021/* Defined in xfaces.c */
1029 1022