Fix return with/without value errors.


(joerg)

$NetBSD: patch-lib_libxview_frame_fm__display.c,v 1.1 2012/11/16 00:29:40 joerg Exp $

--- lib/libxview/frame/fm_display.c.orig	2012-11-14 14:10:46.000000000 +0000
+++ lib/libxview/frame/fm_display.c
@@ -524,7 +524,7 @@ frame_kbd_done(frame_public, sw)
 }
 
 /* ARGSUSED */
-Pkg_private
+Pkg_private void
 frame_set_color(frame, fg, bg)
     Frame_class_info *frame;
     XColor *fg;

$NetBSD: patch-lib_libxview_notice_notice__ol.c,v 1.1 2012/11/16 00:29:40 joerg Exp $

--- lib/libxview/notice/notice_ol.c.orig	2012-11-14 14:14:32.000000000 +0000
+++ lib/libxview/notice/notice_ol.c
@@ -37,7 +37,7 @@ Xv_private void		win_change_property();
 /*
  * Public routines - these routines are private to the notice pkg
  */
-Pkg_private int		notice_subframe_layout();
+Pkg_private void	notice_subframe_layout();
 Pkg_private int		notice_determine_font();
 Pkg_private void	notice_draw_borders();
 Pkg_private int		notice_center();
@@ -82,7 +82,7 @@ Notice_config	Notice_dimensions[] = {
 /*
  * Routine to create sub_frame and panels
  */
-Pkg_private int
+Pkg_private void
 notice_subframe_layout(notice, do_msg, do_butt)
 Notice_info	*notice;
 Bool		do_msg;

$NetBSD: patch-lib_libxview_notice_noticeimpl.h,v 1.1 2012/11/16 00:29:40 joerg Exp $

--- lib/libxview/notice/noticeimpl.h.orig	2012-11-14 14:14:29.000000000 +0000
+++ lib/libxview/notice/noticeimpl.h
@@ -185,7 +185,7 @@ Pkg_private void			notice_build_button()
 Pkg_private void			notice_button_panel_proc();
 Pkg_private int				notice_determine_font();
 Pkg_private int				notice_center();
-Pkg_private int				notice_subframe_layout();
+Pkg_private void			notice_subframe_layout();
 Pkg_private int				notice_text_width();
 Pkg_private int				notice_button_width();
 Pkg_private int				notice_get_owner_frame();

$NetBSD: patch-lib_libxview_notify_ntfy__ctbl.c,v 1.1 2012/11/16 00:29:40 joerg Exp $

--- lib/libxview/notify/ntfy_ctbl.c.orig	2012-11-14 14:18:33.000000000 +0000
+++ lib/libxview/notify/ntfy_ctbl.c
@@ -15,7 +15,7 @@ NTFY_CNDTBL *ntfy_cndtbl[NTFY_LAST_CND];
  * has an interest in.
  */
 
-ntfy_add_to_table(client, condition, type)
+void ntfy_add_to_table(client, condition, type)
     NTFY_CLIENT    *client;
     NTFY_CONDITION *condition;
     int             type;
@@ -70,6 +70,7 @@ ntfy_add_to_table(client, condition, typ
  * table.
  */
 
+void
 ntfy_remove_from_table(client, condition)
     NTFY_CLIENT    *client;
     NTFY_CONDITION *condition;

$NetBSD: patch-lib_libxview_panel_p__num__txt.c,v 1.1 2012/11/16 00:29:40 joerg Exp $

--- lib/libxview/panel/p_num_txt.c.orig	1993-06-29 05:17:03.000000000 +0000
+++ lib/libxview/panel/p_num_txt.c
@@ -698,7 +698,7 @@ num_textitem_scroll_itimer_func( item, w
     Event		event;
  
     if (dp->btn_state & OLGX_INACTIVE)
-        return;
+        return (NOTIFY_DONE);
  
     if (dp->btn_state & UP_SELECTED)
     {
@@ -729,6 +729,7 @@ num_textitem_scroll_itimer_func( item, w
         if (dp->btn_state & DOWN_INACTIVE)
             panel_autoscroll_stop_itimer( item );
     }
+    return (NOTIFY_DONE);
 } /* num_textitem_scroll_itimer_func */
 
 

$NetBSD: patch-lib_libxview_panel_p__select.c,v 1.1 2012/11/16 00:29:40 joerg Exp $

--- lib/libxview/panel/p_select.c.orig	2012-11-14 14:28:21.000000000 +0000
+++ lib/libxview/panel/p_select.c
@@ -357,7 +357,7 @@ panel_default_event(p_public, event, arg
 }
 
 
-Sv1_public
+Sv1_public void
 panel_handle_event(client_object, event)
     Panel_item      client_object;	/* could be a Panel */
     Event          *event;
@@ -375,7 +375,7 @@ panel_handle_event(client_object, event)
 }
 
 
-Sv1_public
+Sv1_public void
 panel_begin_preview(client_object, event)
     Panel_item      client_object;	/* could be a Panel */
     Event          *event;
@@ -390,7 +390,7 @@ panel_begin_preview(client_object, event
 }
 
 
-Sv1_public
+Sv1_public void
 panel_update_preview(client_object, event)
     Panel_item      client_object;	/* could be a Panel */
     Event          *event;
@@ -405,7 +405,7 @@ panel_update_preview(client_object, even
 }
 
 
-Sv1_public
+Sv1_public void
 panel_accept_preview(client_object, event)
     Panel_item      client_object;	/* could be a Panel */
     Event          *event;
@@ -434,7 +434,7 @@ panel_accept_preview(client_object, even
 }
 
 
-Sv1_public
+Sv1_public void
 panel_cancel_preview(client_object, event)
     Panel_item      client_object;	/* could be a Panel */
     Event          *event;
@@ -456,7 +456,7 @@ panel_cancel_preview(client_object, even
 }
 
 
-Sv1_public
+Sv1_public void
 panel_accept_menu(client_object, event)
     Panel_item      client_object;	/* could be a Panel */
     Event          *event;
@@ -480,7 +480,7 @@ panel_accept_menu(client_object, event)
 }
 
 
-Sv1_public
+Sv1_public void
 panel_accept_key(client_object, event)
     Panel_item      client_object;	/* could be a Panel */
     Event          *event;
@@ -495,7 +495,7 @@ panel_accept_key(client_object, event)
 }
 
 
-Sv1_public
+Sv1_public void
 panel_cancel(client_object, event)
     Panel_item      client_object;	/* could be a Panel */
     Event          *event;

$NetBSD: patch-lib_libxview_panel_p__utl.c,v 1.1 2012/11/16 00:29:40 joerg Exp $

--- lib/libxview/panel/p_utl.c.orig	2012-11-14 14:26:03.000000000 +0000
+++ lib/libxview/panel/p_utl.c
@@ -775,7 +775,7 @@ panel_nullproc()
 }
 
 
-Pkg_private
+Pkg_private void
 panel_free_choices(choices, first, last)
     Panel_image    *choices;
     int             first, last;

$NetBSD: patch-lib_libxview_panel_panel.h,v 1.1 2012/11/16 00:29:40 joerg Exp $

--- lib/libxview/panel/panel.h.orig	1993-06-29 05:17:02.000000000 +0000
+++ lib/libxview/panel/panel.h
@@ -703,19 +703,19 @@ EXTERN_FUNCTION (void		panel_show_focus_
 /*
  * event mapping routines 
  */
-EXTERN_FUNCTION (int panel_handle_event, (Panel_item item, Event *event));
+EXTERN_FUNCTION (void panel_handle_event, (Panel_item item, Event *event));
 EXTERN_FUNCTION (void panel_default_handle_event, (Panel_item item, Event *event));
-EXTERN_FUNCTION (int panel_cancel, (Panel_item item, Event *event));
+EXTERN_FUNCTION (void panel_cancel, (Panel_item item, Event *event));
 
 /*
  * Panel_item action routines 
  */
-EXTERN_FUNCTION (int panel_begin_preview, (Panel_item item, Event * event));
-EXTERN_FUNCTION (int panel_update_preview, (Panel_item item, Event *event));
-EXTERN_FUNCTION (int panel_accept_preview, (Panel_item item, Event *event));
-EXTERN_FUNCTION (int panel_cancel_preview, (Panel_item item, Event *event));
-EXTERN_FUNCTION (int panel_accept_menu, (Panel_item item, Event *event));
-EXTERN_FUNCTION (int panel_accept_key, (Panel_item item, Event *event));
+EXTERN_FUNCTION (void panel_begin_preview, (Panel_item item, Event * event));
+EXTERN_FUNCTION (void panel_update_preview, (Panel_item item, Event *event));
+EXTERN_FUNCTION (void panel_accept_preview, (Panel_item item, Event *event));
+EXTERN_FUNCTION (void panel_cancel_preview, (Panel_item item, Event *event));
+EXTERN_FUNCTION (void panel_accept_menu, (Panel_item item, Event *event));
+EXTERN_FUNCTION (void panel_accept_key, (Panel_item item, Event *event));
 
 /*
  * utilities 

$NetBSD: patch-lib_libxview_pw_pixwin.h,v 1.1 2012/11/16 00:29:40 joerg Exp $

--- lib/libxview/pw/pixwin.h.orig	2012-11-14 14:58:02.000000000 +0000
+++ lib/libxview/pw/pixwin.h
@@ -143,8 +143,8 @@ EXTERN_FUNCTION (int xv_read, (Pixrect *
 EXTERN_FUNCTION (int xv_replrop, (Xv_opaque window, int op, int xw, int yw, int width, int height, Pixrect *pr, int xr, int yr)); 
 EXTERN_FUNCTION (int xv_rop, (Xv_opaque window, int op, int x, int y, int width, int height, Pixrect *pr, int xr, int yr));
 EXTERN_FUNCTION (int xv_stencil, (Xv_opaque window, int op, int dx, int dy, int width, int height, Pixrect *stpr, int stx, int sty, Pixrect *spr, int sx, int sy));
-EXTERN_FUNCTION (int xv_text, (Xv_opaque window, int op, int xbasew, int ybasew, Xv_opaque font, char *str));
-EXTERN_FUNCTION (int xv_ttext, (Xv_opaque window, int xbasew, int ybasew, int op, Xv_opaque font, char *str));
+EXTERN_FUNCTION (void xv_text, (Xv_opaque window, int op, int xbasew, int ybasew, Xv_opaque font, char *str));
+EXTERN_FUNCTION (void xv_ttext, (Xv_opaque window, int xbasew, int ybasew, int op, Xv_opaque font, char *str));
 EXTERN_FUNCTION (int xv_vector, (Xv_opaque window, int x0, int y0, int x1, int y1, int op, int cms_index));
 EXTERN_FUNCTION (int pw_batchrop, (Pixwin *pw, int x, int y, int op, struct pr_prpos *sbp, int m));
 EXTERN_FUNCTION (int pw_get, (Xv_opaque xv_drawable, int x, int y));

$NetBSD: patch-lib_libxview_pw_xv__text.c,v 1.1 2012/11/16 00:29:40 joerg Exp $

--- lib/libxview/pw/xv_text.c.orig	2012-11-14 14:57:50.000000000 +0000
+++ lib/libxview/pw/xv_text.c
@@ -37,7 +37,7 @@ pw_char(pw, xw, yw, op, pixfont, c)
     (void) xv_text(pw, xw, yw, op, (Xv_opaque)pixfont, str);
 }
 
-Xv_public int
+Xv_public void
 xv_ttext(window, xbasew, ybasew, op, pixfont, str)
     Xv_opaque       window;
     int             op;
@@ -76,7 +76,7 @@ xv_ttext(window, xbasew, ybasew, op, pix
     XDrawString(display, d, gc, xbasew, ybasew, str, len);
 }
 
-Xv_public int
+Xv_public void
 xv_text(window, xbasew, ybasew, op, pixfont, str)
     Xv_opaque       window;
     int             op;

$NetBSD: patch-lib_libxview_rect_rect.c,v 1.1 2012/11/16 00:29:40 joerg Exp $

--- lib/libxview/rect/rect.c.orig	2012-11-14 15:07:09.000000000 +0000
+++ lib/libxview/rect/rect.c
@@ -24,8 +24,7 @@ static char     sccsid[] = "@(#)rect.c 2
 /*
  * Rect geometry functions
  */
-rect_intersection(r1, r2, r)
-    register struct rect *r1, *r2, *r;
+void rect_intersection(Rect *r1, Rect *r2, Rect *r)
 {
     r->r_left = MAX(r1->r_left, r2->r_left);
     r->r_top = MAX(r1->r_top, r2->r_top);

$NetBSD: patch-lib_libxview_rect_rect.h,v 1.1 2012/11/16 00:29:40 joerg Exp $

--- lib/libxview/rect/rect.h.orig	1993-06-29 05:15:17.000000000 +0000
+++ lib/libxview/rect/rect.h
@@ -135,10 +135,7 @@ EXTERN_FUNCTION (unsigned rect_clipvecto
 EXTERN_FUNCTION (unsigned rect_order, (Rect *rl, Rect *r2, int sortorder));
 EXTERN_FUNCTION (int rect_right_of, (Rect *rect1, Rect *rect2));
 EXTERN_FUNCTION (int rect_below, (Rect *rect1, Rect *rect2));
-#ifdef _OTHER_RECT_FUNCTIONS
-
 EXTERN_FUNCTION (void rect_intersection, (Rect *rl, Rect *r2, Rect *r));
 EXTERN_FUNCTION (int rect_distance, (Rect *rect, int x, int y, int * x_used, int * y_used));
-#endif /* _OTHER_RECT_FUNCTIONS */
 
 #endif /* ~xview_rect_DEFINED */

$NetBSD: patch-lib_libxview_rect_rectlist.c,v 1.1 2012/11/16 00:29:40 joerg Exp $

--- lib/libxview/rect/rectlist.c.orig	2012-11-14 15:15:07.000000000 +0000
+++ lib/libxview/rect/rectlist.c
@@ -39,6 +39,9 @@ extern struct rectlist rl_null;
 struct rectnode *_rl_getrectnode(), **_rl_removerectnode();
 unsigned        rl_boundintersectsrect();
 
+void _rl_appendrect(struct rect *r, struct rectlist *rl);
+void _rl_removerect(struct rect *r, struct rectlist *rl);
+
 /*
  * rectlist geometry functions
  */
@@ -85,7 +88,7 @@ rl_intersection(rl1, rl2, rl)
     *rl = rlresult;
 }
 
-rl_sort(rl1, rl, sortorder)
+void rl_sort(rl1, rl, sortorder)
     register struct rectlist *rl1, *rl;
     int             sortorder;
 {
@@ -130,7 +133,7 @@ rl_sort(rl1, rl, sortorder)
     *rl = rlresult;
 }
 
-rl_union(rl1, rl2, rl)
+void rl_union(rl1, rl2, rl)
     register struct rectlist *rl1, *rl2, *rl;
 {
     if (rl1 == rl)
@@ -143,7 +146,7 @@ rl_union(rl1, rl2, rl)
     }
 }
 
-rl_difference(rl1, rl2, rl)
+void rl_difference(rl1, rl2, rl)
     register struct rectlist *rl1, *rl2, *rl;
 {
     struct rect     r;
@@ -245,7 +248,7 @@ rl_rectintersects(r, rl)
     return (FALSE);
 }
 
-rl_rectintersection(r, rl1, rl)
+void rl_rectintersection(r, rl1, rl)
     register struct rect *r;
     register struct rectlist *rl1, *rl;
 {
@@ -265,7 +268,7 @@ rl_rectintersection(r, rl1, rl)
     *rl = rlresult;
 }
 
-rl_rectunion(r, rl1, rl)
+void rl_rectunion(r, rl1, rl)
     register struct rect *r;
     register struct rectlist *rl1, *rl;
 {
@@ -284,7 +287,7 @@ rl_rectunion(r, rl1, rl)
     _rl_append(rl, &rlresult);
 }
 
-rl_rectdifference(r, rl1, rl)
+void rl_rectdifference(r, rl1, rl)
     register struct rect *r;
     register struct rectlist *rl1, *rl;
 {
@@ -316,7 +319,7 @@ rl_rectdifference(r, rl1, rl)
  * rectlist initialization functions
  */
 
-rl_initwithrect(r, rl)
+void rl_initwithrect(r, rl)
     register struct rect *r;
     struct rectlist *rl;
 {
@@ -328,7 +331,7 @@ rl_initwithrect(r, rl)
 /*
  * rectlist List Memory Management functions
  */
-rl_copy(rl1, rl)
+void rl_copy(rl1, rl)
     register struct rectlist *rl1, *rl;
 {
     register struct rectnode *rn;
@@ -343,8 +346,7 @@ rl_copy(rl1, rl)
     }
 }
 
-rl_free(rl)
-    register struct rectlist *rl;
+void rl_free(struct rectlist *rl)
 {
     register struct rectnode *rn, *rn_next, *rn_last = (struct rectnode *) 0;
 
@@ -362,7 +364,7 @@ rl_free(rl)
     *rl = rl_null;
 }
 
-rl_coalesce(rl)
+void rl_coalesce(rl)
     register struct rectlist *rl;
 {
     struct rectnode *rn;
@@ -390,7 +392,7 @@ rl_coalesce(rl)
     }
 }
 
-rl_normalize(rl)
+void rl_normalize(rl)
     register struct rectlist *rl;
 {
     struct rectnode *rn;
@@ -407,7 +409,7 @@ rl_normalize(rl)
 
 /* Debug Utilities	 */
 
-rl_print(rl, tag)
+void rl_print(rl, tag)
     struct rectlist *rl;
     char           *tag;
 {
@@ -432,7 +434,7 @@ rl_print(rl, tag)
 /*
  * Create node for r and app to rl
  */
-_rl_appendrect(r, rl)
+void _rl_appendrect(r, rl)
     register struct rect *r;
     register struct rectlist *rl;
 {
@@ -579,7 +581,7 @@ _rl_freerectnode(rn)
     rnFree = rn;
 }
 
-_rl_removerect(r, rl)
+void _rl_removerect(r, rl)
     register struct rect *r;
     register struct rectlist *rl;
 {

$NetBSD: patch-lib_libxview_rect_rectlist.h,v 1.1 2012/11/16 00:29:40 joerg Exp $

--- lib/libxview/rect/rectlist.h.orig	2012-11-14 15:15:09.000000000 +0000
+++ lib/libxview/rect/rectlist.h
@@ -100,8 +100,6 @@ EXTERN_FUNCTION (unsigned rl_rectinterse
 EXTERN_FUNCTION (unsigned rl_equalrect, (Rect *r, Rectlist *rl));
 EXTERN_FUNCTION (unsigned rl_includespoint, (Rectlist *r, int x, int y));
 
-#ifdef xview_other_rl_funcs
-
 EXTERN_FUNCTION (void rl_rectintersection, (Rect *r, Rectlist *rl1, Rectlist *rl));
 EXTERN_FUNCTION (void rl_rectunion, (Rect *r, Rectlist *rl1, Rectlist *rl));
 EXTERN_FUNCTION (void rl_rectdifference, (Rect *r, Rectlist *rl1, Rectlist *rl));
@@ -116,6 +114,4 @@ EXTERN_FUNCTION (void rl_coalesce, (Rect
 EXTERN_FUNCTION (void rl_normalize, (Rectlist *rl));
 EXTERN_FUNCTION (void rl_print, (Rectlist *rl, char *tag));
 
-#endif /* xview_other_rl_funcs */
-
 #endif	/* ~xview_rectlist_DEFINED */

$NetBSD: patch-lib_libxview_server_svr__parse.c,v 1.1 2012/11/16 00:29:40 joerg Exp $

--- lib/libxview/server/svr_parse.c.orig	2012-11-14 15:26:31.000000000 +0000
+++ lib/libxview/server/svr_parse.c
@@ -674,7 +674,7 @@ CHAR			*pos;
     /* if keysym already set, that's an error */
     if( avp->keysym ) {
 	avp->error = 1;
-	return;
+	return NULL;
     }
 
     /* look for 'raw' space or punctuation */

$NetBSD: patch-lib_libxview_textsw_txt__18impl.h,v 1.1 2012/11/16 00:29:40 joerg Exp $

--- lib/libxview/textsw/txt_18impl.h.orig	2012-11-14 15:33:44.000000000 +0000
+++ lib/libxview/textsw/txt_18impl.h
@@ -24,4 +24,7 @@
 
 #endif /* OW_I18N */
 
+Pkg_private void
+es_file_append_error(char *, CHAR *, Es_status);
+
 #endif /* txt_18impl_h_DEFINED */

$NetBSD: patch-lib_libxview_textsw_txt__find.c,v 1.1 2012/11/16 00:29:40 joerg Exp $

--- lib/libxview/textsw/txt_find.c.orig	2012-11-14 15:43:10.000000000 +0000
+++ lib/libxview/textsw/txt_find.c
@@ -142,7 +142,7 @@ textsw_find_selection_and_normalize(view
 }
 
 /* Caller must set *first to be position at which to start the search. */
-Pkg_private int
+Pkg_private void
 textsw_find_pattern(textsw, first, last_plus_one, buf, buf_len, flags)
     Textsw_folio    textsw;
     Es_index       *first, *last_plus_one;

$NetBSD: patch-lib_libxview_textsw_txt__sel.c,v 1.1 2012/11/16 00:29:40 joerg Exp $

--- lib/libxview/textsw/txt_sel.c.orig	2012-11-14 16:32:32.000000000 +0000
+++ lib/libxview/textsw/txt_sel.c
@@ -588,7 +588,7 @@ textsw_mouseless_select_event(view, ie, 
 	return is_select_event;
 }
 
-static int
+static void
 update_selection(view, ie)
     Textsw_view_handle view;
     register Event *ie;

$NetBSD: patch-lib_libxview_ttysw_tty__menu.c,v 1.1 2012/11/16 00:29:40 joerg Exp $

--- lib/libxview/ttysw/tty_menu.c.orig	2012-11-14 16:02:26.000000000 +0000
+++ lib/libxview/ttysw/tty_menu.c
@@ -67,8 +67,8 @@ static void     ttysw_disable_scrolling(
 static void     ttysw_menu_page();
 static void     ttysw_menu_copy();
 static void     ttysw_menu_paste();
-/* static */ int ttysw_enable_editor();
-/* static */ int ttysw_disable_editor();
+/* static */ void ttysw_enable_editor();
+/* static */ void ttysw_disable_editor();
 /* static */ int ttysw_mode_action();
 /* static */ void
 	fit_termsw_panel_and_textsw(); /* BUG ALERT: No XView prefix */
@@ -684,7 +684,7 @@ fit_termsw_panel_and_textsw(frame, terms
 }
 
 /*ARGSUSED*/
-/* static */ int
+/* static */ void
 ttysw_enable_editor(cmd_menu, cmd_item)
     Menu            cmd_menu;
     Menu_item       cmd_item;
@@ -794,7 +794,7 @@ Press \"Continue\" to proceed."),
 
 
 /* ARGSUSED */
-/* static */ int
+/* static */ void
 ttysw_disable_editor(cmd_menu, cmd_item)
     Menu            cmd_menu;
     Menu_item       cmd_item;

$NetBSD: patch-lib_libxview_win_win__global.c,v 1.1 2012/11/16 00:29:40 joerg Exp $

--- lib/libxview/win/win_global.c.orig	2012-11-14 16:04:45.000000000 +0000
+++ lib/libxview/win/win_global.c
@@ -46,7 +46,7 @@ int             win_grabiodebug;
 /*
  * Server operations applying globally.
  */
-win_lockdata(window)
+void win_lockdata(window)
     Xv_object       window;
 {
     Xv_Drawable_info *info;
@@ -58,7 +58,7 @@ win_lockdata(window)
     XGrabServer(xv_display(info));
 }
 
-win_unlockdata(window)
+void win_unlockdata(window)
     Xv_object       window;
 {
     Xv_Drawable_info *info;
@@ -99,7 +99,7 @@ xv_win_grab(window, im, cursor_window, c
     if (status)
         *status = 1; /* initialize to be OK */
     if (win_grabiodebug)
-	return;
+	return 0;
     DRAWABLE_INFO_MACRO(window, info);
     display = xv_display(info);
 
@@ -160,7 +160,7 @@ xv_win_grab(window, im, cursor_window, c
     return (GrabSuccess);
 }
 
-Xv_private int
+Xv_private void
 xv_win_ungrab(window, ungrab_pointer, ungrab_kbd, ungrab_server)
     Xv_object       window;
     int		    ungrab_pointer, ungrab_kbd, ungrab_server;
@@ -196,7 +196,7 @@ win_grabio(window)
     return (win_xgrabio_async(window, im, 0, 0));
 }
 
-win_xgrabio_sync(window, im, cursor_window, cursor)
+int win_xgrabio_sync(window, im, cursor_window, cursor)
     Xv_object       window;
     Inputmask      *im;
     Xv_object       cursor_window;
@@ -207,7 +207,7 @@ win_xgrabio_sync(window, im, cursor_wind
     unsigned int    xevent_mask = win_im_to_xmask(window, im);
 
     if (win_grabiodebug)
-	return;
+	return 0;
     DRAWABLE_INFO_MACRO(window, info);
     display = xv_display(info);
 
@@ -245,7 +245,7 @@ win_xgrabio_sync(window, im, cursor_wind
     return (1);
 }
 
-win_xgrabio_async(window, im, cursor_window, cursor)
+int win_xgrabio_async(window, im, cursor_window, cursor)
     Xv_object       window;
     Inputmask      *im;
     Xv_object       cursor_window;
@@ -256,7 +256,7 @@ win_xgrabio_async(window, im, cursor_win
     unsigned int    xevent_mask = win_im_to_xmask(window, im);
 
     if (win_grabiodebug)
-	return;
+	return 0;
     DRAWABLE_INFO_MACRO(window, info);
     display = xv_display(info);
 
@@ -309,7 +309,7 @@ win_set_grabio_params(window, im, cursor
 			     CurrentTime);
 }
 
-win_releaseio(window)
+void win_releaseio(window)
     Xv_object       window;
 {
     Xv_Drawable_info *info;

$NetBSD: patch-lib_libxview_window_window__cms.c,v 1.1 2012/11/16 00:29:40 joerg Exp $

--- lib/libxview/window/window_cms.c.orig	2012-11-14 16:20:06.000000000 +0000
+++ lib/libxview/window/window_cms.c
@@ -24,7 +24,7 @@ Attr_attribute  xv_cms_name_key = NULL;
 void            window_set_cms();
 void		window_set_cmap_property();
 
-Xv_private
+Xv_private void
 window_set_cms_name(win_public, new_name)
     Xv_Window       win_public;
     char           *new_name;
@@ -65,7 +65,7 @@ window_set_cms_name(win_public, new_name
     }
 }
 
-Xv_private
+Xv_private void
 window_set_cms_data(win_public, cms_data)
     Xv_Window       win_public;
     Xv_cmsdata     *cms_data;

$NetBSD: patch-lib_libxview_window_windowutil.c,v 1.1 2012/11/16 00:29:40 joerg Exp $

--- lib/libxview/window/windowutil.c.orig	2012-11-14 16:17:51.000000000 +0000
+++ lib/libxview/window/windowutil.c
@@ -508,7 +508,7 @@ window_set_cache_rect(window, rect)
 	}
 }
 
-Xv_private
+Xv_private void
 window_set_parent(window, parent)
     Xv_Window       window, parent;
 {
@@ -767,7 +767,7 @@ window_adjust_rects(rect_obj_list, paren
 
 	adjust_rect_obj(num_elems, this_sw, rect_obj_list, parent_width, parent_height);
 	window_outer_to_innerrect(&(rect_obj_list[this_sw]),
-				  rect_obj_list[this_sw].new_rect);
+				  &rect_obj_list[this_sw].new_rect);
     }
 }