(x_destroy_bitmap): Declare as void, not int.

(x_report_frame_params, x_set_border_pixel): Likewise.
(x_set_internal_border_width): widget_store_internal_border takes
just one arg, not two.

diff --git a/src/xfns.c b/src/xfns.c
index 809c2b45ee711321583d2f59b96e019e10fd1fb0..0fdb4562f165921b63d739b9ed77ff4fb7c6ca4a 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -611,7 +611,7 @@ x_create_bitmap_from_file (f, file)
 
 /* Remove reference to bitmap with id number ID.  */
 
-int
+void
 x_destroy_bitmap (f, id)
      FRAME_PTR f;
      int id;
@@ -1023,6 +1023,7 @@ x_real_positions (f, xptr, yptr)
    and whose values are not correctly recorded in the frame's
    param_alist need to be considered here.  */
 
+void
 x_report_frame_params (f, alistptr)
      struct frame *f;
      Lisp_Object *alistptr;
@@ -1445,6 +1446,7 @@ x_set_border_color (f, arg, oldval)
    Note that this does not fully take effect if done before
    F has an x-window.  */
 
+void
 x_set_border_pixel (f, pix)
      struct frame *f;
      int pix;
@@ -1653,8 +1655,7 @@ x_set_internal_border_width (f, arg, oldval)
 
 #ifdef USE_X_TOOLKIT
   if (f->output_data.x->edit_widget)
-    widget_store_internal_border (f->output_data.x->edit_widget,
-                                 f->output_data.x->internal_border_width);
+    widget_store_internal_border (f->output_data.x->edit_widget);
 #endif
 
   if (f->output_data.x->internal_border_width == old)