From d3e597f06207fd6d2ea720a69befc96eddb9776d Mon Sep 17 00:00:00 2001 From: Thierry Thomas Date: Thu, 25 May 2006 20:51:32 +0000 Subject: Cleanup. The changes are mostly cosmetical but should help the build on platforms different than i386. Add a WWW link. PR: ports/94990 Submitted by: Pedro F. Giffuni --- .../files/patch+lib+libxview+panel+p_mlinetxt.c | 19 +++ .../xview/files/patch+lib+libxview+panel+panel.c | 10 ++ .../xview/files/patch-clients+clock+clock.c | 131 +++++++++++++++++++++ x11-toolkits/xview/files/patch-clients+olwm+st.c | 11 ++ .../xview/files/patch-clients+olwmslave+helprecv.c | 11 ++ .../files/patch-clients+olwmslave+olwmslave.c | 15 +++ .../files/patch-clients+olwmslave+propsrecv.c | 11 ++ .../xview/files/patch-clients+olwmslave+propswin.c | 15 +++ .../files/patch-lib+libxview+frame+fm_input.c | 10 ++ .../files/patch-lib+libxview+io_stream+input.c | 11 ++ .../files/patch-lib+libxview+notice+notice_set.c | 10 ++ .../files/patch-lib+libxview+notify+ndet_wait.c | 11 ++ .../files/patch-lib+libxview+notify+ndetselect.c | 10 ++ .../xview/files/patch-lib+libxview+panel+p_list.c | 92 +++++++++++++++ .../xview/files/patch-lib+libxview+panel+plist.c | 92 --------------- .../files/patch-lib+libxview+screen+scrn_get.c | 10 ++ .../xview/files/patch-lib+libxview+sel+seln.c | 10 ++ .../files/patch-lib+libxview+textsw+txt_event.c | 10 ++ .../files/patch-lib+libxview+textsw+txt_field.c | 20 ++++ .../files/patch-lib+libxview+textsw+txt_getkey.c | 11 ++ .../files/patch-lib+libxview+textsw+txt_menu.c | 20 ++++ .../files/patch-lib+libxview+textsw+txt_search.c | 11 ++ .../files/patch-lib+libxview+ttysw+tty_newtxt.c | 10 ++ .../files/patch-lib+libxview+win+win_cntral.c | 10 ++ x11-toolkits/xview/pkg-descr | 2 + 25 files changed, 481 insertions(+), 92 deletions(-) create mode 100644 x11-toolkits/xview/files/patch+lib+libxview+panel+p_mlinetxt.c create mode 100644 x11-toolkits/xview/files/patch+lib+libxview+panel+panel.c create mode 100644 x11-toolkits/xview/files/patch-clients+clock+clock.c create mode 100644 x11-toolkits/xview/files/patch-clients+olwm+st.c create mode 100644 x11-toolkits/xview/files/patch-clients+olwmslave+helprecv.c create mode 100644 x11-toolkits/xview/files/patch-clients+olwmslave+olwmslave.c create mode 100644 x11-toolkits/xview/files/patch-clients+olwmslave+propsrecv.c create mode 100644 x11-toolkits/xview/files/patch-clients+olwmslave+propswin.c create mode 100644 x11-toolkits/xview/files/patch-lib+libxview+frame+fm_input.c create mode 100644 x11-toolkits/xview/files/patch-lib+libxview+io_stream+input.c create mode 100644 x11-toolkits/xview/files/patch-lib+libxview+notice+notice_set.c create mode 100644 x11-toolkits/xview/files/patch-lib+libxview+notify+ndet_wait.c create mode 100644 x11-toolkits/xview/files/patch-lib+libxview+notify+ndetselect.c create mode 100644 x11-toolkits/xview/files/patch-lib+libxview+panel+p_list.c delete mode 100644 x11-toolkits/xview/files/patch-lib+libxview+panel+plist.c create mode 100644 x11-toolkits/xview/files/patch-lib+libxview+screen+scrn_get.c create mode 100644 x11-toolkits/xview/files/patch-lib+libxview+sel+seln.c create mode 100644 x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_event.c create mode 100644 x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_field.c create mode 100644 x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_getkey.c create mode 100644 x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_menu.c create mode 100644 x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_search.c create mode 100644 x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_newtxt.c create mode 100644 x11-toolkits/xview/files/patch-lib+libxview+win+win_cntral.c (limited to 'x11-toolkits/xview') diff --git a/x11-toolkits/xview/files/patch+lib+libxview+panel+p_mlinetxt.c b/x11-toolkits/xview/files/patch+lib+libxview+panel+p_mlinetxt.c new file mode 100644 index 000000000000..59243ee8c8b7 --- /dev/null +++ b/x11-toolkits/xview/files/patch+lib+libxview+panel+p_mlinetxt.c @@ -0,0 +1,19 @@ +--- lib/libxview/panel/p_mlinetxt.c.orig Sat Mar 25 23:52:08 2006 ++++ lib/libxview/panel/p_mlinetxt.c Sun Mar 26 00:22:01 2006 +@@ -14,6 +14,7 @@ + * Multi-line Text Field Panel Item + */ + #include ++#include + #include + #include + #include +@@ -449,7 +450,7 @@ + return (Xv_opaque) dp->rows_displayed; + + case PANEL_ITEM_NTH_WINDOW: +- switch (*(int *) valist) { ++ switch (va_arg(valist, int)) { + case 0: + return dp->view; + case 1: diff --git a/x11-toolkits/xview/files/patch+lib+libxview+panel+panel.c b/x11-toolkits/xview/files/patch+lib+libxview+panel+panel.c new file mode 100644 index 000000000000..9271c4804c39 --- /dev/null +++ b/x11-toolkits/xview/files/patch+lib+libxview+panel+panel.c @@ -0,0 +1,10 @@ +--- lib/libxview/panel/panel.c.orig Sat Mar 25 23:52:08 2006 ++++ lib/libxview/panel/panel.c Sun Mar 26 00:19:28 2006 +@@ -27,6 +27,7 @@ + Pkg_private int panel_destroy(); + + static int panel_layout(); ++static int panel_unregister_view(Panel_info *panel, Xv_Window view); + + Xv_private_data Defaults_pairs xv_kbd_cmds_value_pairs[4]; + diff --git a/x11-toolkits/xview/files/patch-clients+clock+clock.c b/x11-toolkits/xview/files/patch-clients+clock+clock.c new file mode 100644 index 000000000000..91b11db9d180 --- /dev/null +++ b/x11-toolkits/xview/files/patch-clients+clock+clock.c @@ -0,0 +1,131 @@ +--- clients/clock/clock.c.orig Tue Jun 29 00:11:39 1993 ++++ clients/clock/clock.c Sun Mar 26 16:29:50 2006 +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -146,6 +147,10 @@ + static Notify_value analog_timer_expired(); + static Notify_value icon_timer_expired(); + static Notify_value dig_timer_expired(); ++static int min (int a, int b); ++static int seconds_on(); ++static int date_on(); ++static int armwidth(); + + typedef enum {digital, analog} Face; + +@@ -488,7 +493,7 @@ + init_images (c, w, h) + Clock c; int w, h; + { +- int now; ++ time_t now; + struct tm *tm; + + /* resize the remote images */ +@@ -866,7 +871,7 @@ + paint_date (c) + Clock c; + { +- int now; ++ time_t now; + struct tm *tm; + char buf[25]; + Frame f; +@@ -910,7 +915,8 @@ + paint_second_hand (c) + Clock c; + { +- int x, y, diameter, radius, now, fromrim, angle, height, width; ++ int x, y, diameter, radius, fromrim, angle, height, width; ++ time_t now; + struct tm *tm; + ClockDisplay d; + Pixwin *pw; +@@ -993,7 +999,8 @@ + Pixwin * pw; + Rectlist *area; + { +- int w, h, x, y, prw, prh, now; ++ int w, h, x, y, prw, prh; ++ time_t now; + struct tm *tm; + Clock c; + +@@ -1020,7 +1027,7 @@ + Pixwin *pw; + Rectlist *area; + { +- int now; ++ time_t now; + Font_string_dims size; + struct tm *tm; + Clock c; +@@ -1048,7 +1055,8 @@ + icon_timer_expired (me, which) + { + static int mins, hours; +- int now, w, h; ++ time_t now; ++ int w, h; + struct tm *tm; + Font_string_dims size; + Clock c; +@@ -1077,11 +1085,12 @@ + + static Notify_value + analog_timer_expired (me, which) +- Notify_value me; ++ Frame me; + int which; + { + static int mins, hours; +- int now, x, y, w, h, prw, prh; ++ time_t now; ++ int x, y, w, h, prw, prh; + struct tm *tm; + Clock c; + +@@ -1154,7 +1163,8 @@ + Pixwin * pw; + Rectlist *area; + { +- int i, now, y_coord, fontHeight, fontWidth; ++ int i, y_coord, fontHeight, fontWidth; ++ time_t now; + struct tm *tm; + Clock c; + ClockDisplay d; +@@ -1211,7 +1221,7 @@ + int which, invalidate; + { + static int mins, hours; +- int now; ++ time_t now; + struct tm *tm; + Clock c; + +@@ -1273,7 +1283,8 @@ + Panel_item item; + Event *event; + { +- int w, h, now; ++ int w, h; ++ time_t now; + struct tm *tm; + Clock c = (Clock) xv_get (item, XV_KEY_DATA, key, 0); + ClockDisplay d = c-> display; +@@ -1662,7 +1673,7 @@ + init_clck (argc, argv) + int argc; char **argv; + { +- int now; ++ time_t now; + struct tm *tm; + Menu_item tmp_item; + char **argscanner = argv; diff --git a/x11-toolkits/xview/files/patch-clients+olwm+st.c b/x11-toolkits/xview/files/patch-clients+olwm+st.c new file mode 100644 index 000000000000..e7afb68900a6 --- /dev/null +++ b/x11-toolkits/xview/files/patch-clients+olwm+st.c @@ -0,0 +1,11 @@ +--- clients/olwm/st.c.orig Sat Mar 25 22:22:56 2006 ++++ clients/olwm/st.c Sat Mar 25 22:23:59 2006 +@@ -34,6 +34,8 @@ + (table->hash == ST_NUMHASH) ? ((int) (key) % table->num_bins) :\ + (*table->hash)((key), table->num_bins)) + ++static rehash(st_table *table); ++ + st_table *st_init_table_with_params(compare, hash, size, density, grow_factor, + reorder_flag) + int (*compare)(); diff --git a/x11-toolkits/xview/files/patch-clients+olwmslave+helprecv.c b/x11-toolkits/xview/files/patch-clients+olwmslave+helprecv.c new file mode 100644 index 000000000000..753895c2bd87 --- /dev/null +++ b/x11-toolkits/xview/files/patch-clients+olwmslave+helprecv.c @@ -0,0 +1,11 @@ +--- clients/olwmslave/helprecv.c.orig Sat Mar 25 22:29:53 2006 ++++ clients/olwmslave/helprecv.c Sat Mar 25 22:30:46 2006 +@@ -15,7 +15,7 @@ + #include "helpcmd.h" + + extern int ShowHelpWindow(); +- void ReceiveHelpCmd(); ++static void ReceiveHelpCmd(); + + /* ---------------------------------------------------------------------- + * RegisterHelpWindow diff --git a/x11-toolkits/xview/files/patch-clients+olwmslave+olwmslave.c b/x11-toolkits/xview/files/patch-clients+olwmslave+olwmslave.c new file mode 100644 index 000000000000..dbe157b71903 --- /dev/null +++ b/x11-toolkits/xview/files/patch-clients+olwmslave+olwmslave.c @@ -0,0 +1,15 @@ +--- clients/olwmslave/olwmslave.c.orig Sat Mar 25 22:35:19 2006 ++++ clients/olwmslave/olwmslave.c Sat Mar 25 22:36:52 2006 +@@ -44,9 +44,9 @@ + /* ---------------------------------------------------------------------- + * Forward Definitions + * ----------------------------------------------------------------------*/ +-void InitScreenInfo(); +-void ParseScreenArgs(); +-Notify_value InputReader(); ++static void InitScreenInfo(); ++static void ParseScreenArgs(); ++static Notify_value InputReader(); + + /* ---------------------------------------------------------------------- + * main diff --git a/x11-toolkits/xview/files/patch-clients+olwmslave+propsrecv.c b/x11-toolkits/xview/files/patch-clients+olwmslave+propsrecv.c new file mode 100644 index 000000000000..650a4f00338a --- /dev/null +++ b/x11-toolkits/xview/files/patch-clients+olwmslave+propsrecv.c @@ -0,0 +1,11 @@ +--- clients/olwmslave/propsrecv.c.orig Sat Mar 25 22:42:20 2006 ++++ clients/olwmslave/propsrecv.c Sat Mar 25 22:43:01 2006 +@@ -15,7 +15,7 @@ + #include "propscmd.h" + + extern int ShowWindowProps(); +- void ReceivePropsCmd(); ++static void ReceivePropsCmd(); + + /* ---------------------------------------------------------------------- + * RegisterPropsWindow diff --git a/x11-toolkits/xview/files/patch-clients+olwmslave+propswin.c b/x11-toolkits/xview/files/patch-clients+olwmslave+propswin.c new file mode 100644 index 000000000000..3e64f9b3ca7c --- /dev/null +++ b/x11-toolkits/xview/files/patch-clients+olwmslave+propswin.c @@ -0,0 +1,15 @@ +--- clients/olwmslave/propswin.c.orig Sat Mar 25 22:43:32 2006 ++++ clients/olwmslave/propswin.c Sat Mar 25 22:44:16 2006 +@@ -38,9 +38,9 @@ + * Local Forward Declarations + * ----------------------------------------------------------------------*/ + int ShowWindowProps(); +-void InitWindowProps(); +-Bool CreateWindowProps(); +-Notify_value DestroyWindowProps(); ++static void InitWindowProps(); ++static Bool CreateWindowProps(); ++static Notify_value DestroyWindowProps(); + void ApplyProps(); + void ResetProps(); + diff --git a/x11-toolkits/xview/files/patch-lib+libxview+frame+fm_input.c b/x11-toolkits/xview/files/patch-lib+libxview+frame+fm_input.c new file mode 100644 index 000000000000..fe1a90c03f1b --- /dev/null +++ b/x11-toolkits/xview/files/patch-lib+libxview+frame+fm_input.c @@ -0,0 +1,10 @@ +--- lib/libxview/frame/fm_input.c.orig Sat Mar 25 23:39:23 2006 ++++ lib/libxview/frame/fm_input.c Sat Mar 25 23:42:06 2006 +@@ -359,6 +359,7 @@ + */ + Xv_private void + frame_set_accept_default_focus(frame_public, flag) ++ Frame frame_public; + { + Frame_class_info *frame = FRAME_CLASS_PRIVATE(frame_public); + diff --git a/x11-toolkits/xview/files/patch-lib+libxview+io_stream+input.c b/x11-toolkits/xview/files/patch-lib+libxview+io_stream+input.c new file mode 100644 index 000000000000..2633c92172f4 --- /dev/null +++ b/x11-toolkits/xview/files/patch-lib+libxview+io_stream+input.c @@ -0,0 +1,11 @@ +--- lib/libxview/io_stream/input.c.orig Sat Mar 25 23:13:46 2006 ++++ lib/libxview/io_stream/input.c Sat Mar 25 23:14:17 2006 +@@ -22,7 +22,7 @@ + XV_MSG("input stream not of type input"), 0); \ + ops = in->ops.input_ops + +-char *stream_getstring(); ++static char *stream_getstring(); + + /* GENERIC INPUT FUNCTIONS */ + diff --git a/x11-toolkits/xview/files/patch-lib+libxview+notice+notice_set.c b/x11-toolkits/xview/files/patch-lib+libxview+notice+notice_set.c new file mode 100644 index 000000000000..240c661df396 --- /dev/null +++ b/x11-toolkits/xview/files/patch-lib+libxview+notice+notice_set.c @@ -0,0 +1,10 @@ +--- lib/libxview/notice/notice_set.c.orig Sun Mar 26 00:02:43 2006 ++++ lib/libxview/notice/notice_set.c Sun Mar 26 00:04:18 2006 +@@ -22,7 +22,6 @@ + #include + #include + +-extern char *strchr(); + Pkg_private Xv_opaque notice_generic_set(); + #ifdef OW_I18N + static CHAR **notice_string_set(); diff --git a/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet_wait.c b/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet_wait.c new file mode 100644 index 000000000000..110f6141cbbf --- /dev/null +++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet_wait.c @@ -0,0 +1,11 @@ +--- lib/libxview/notify/ndet_wait.c.orig 2006-01-04 11:52:12.000000000 +0000 ++++ lib/libxview/notify/ndet_wait.c +@@ -18,8 +18,6 @@ static char sccsid[] = "@(#)ndet_wai + #include + #include + +-extern errno; +- + pkg_private int + ndet_check_pid(pid) + int pid; diff --git a/x11-toolkits/xview/files/patch-lib+libxview+notify+ndetselect.c b/x11-toolkits/xview/files/patch-lib+libxview+notify+ndetselect.c new file mode 100644 index 000000000000..6fca857388f5 --- /dev/null +++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+ndetselect.c @@ -0,0 +1,10 @@ +--- lib/libxview/notify/ndetselect.c.orig 2006-01-04 11:53:02.000000000 +0000 ++++ lib/libxview/notify/ndetselect.c +@@ -28,7 +28,6 @@ static int ndet_select_nfds, ndet_s + + static Notify_client ndet_select_nclient = (Notify_client) & ndet_select_ibits; + +-extern errno; + extern int notify_exclude_fd; + + extern int diff --git a/x11-toolkits/xview/files/patch-lib+libxview+panel+p_list.c b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_list.c new file mode 100644 index 000000000000..f8b343a0c6e4 --- /dev/null +++ b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_list.c @@ -0,0 +1,92 @@ +--- lib/libxview/panel/p_list.c.orig Tue Jun 29 14:16:48 1993 ++++ lib/libxview/panel/p_list.c Sun Jan 10 01:47:42 1999 +@@ -1239,7 +1239,7 @@ + return ((Xv_opaque) dp->choose_one); + + case PANEL_ITEM_NTH_WINDOW: +- if (*(int *) valist == 0) ++ if (va_arg(valist, int) == 0) + return (Xv_opaque) dp->list_sb; + else + return (Xv_opaque) NULL; +@@ -1266,7 +1266,7 @@ + return (Xv_opaque) dp->list_sb; + + case PANEL_LIST_SELECTED: +- row = *(int *) valist; ++ row = va_arg(valist, int); + node = find_or_create_nth_row(dp, row, FALSE); + return (node ? (Xv_opaque) node->f.selected : (Xv_opaque) XV_ERROR); + +@@ -1278,7 +1278,7 @@ + return -1; /* no rows selected */ + + case PANEL_LIST_NEXT_SELECTED: +- row = *(int *) valist; ++ row = va_arg(valist, int); + node = find_or_create_nth_row(dp, row, FALSE); + if (!node) + return -1; /* specified row doesn't exist */ +@@ -1289,7 +1289,7 @@ + return -1; /* no subsequent row selected */ + + case PANEL_LIST_CLIENT_DATA: +- row = *(int *) valist; ++ row = va_arg(valist, int); + node = find_or_create_nth_row(dp, row, FALSE); + return (node ? (Xv_opaque) node->client_data : (Xv_opaque) XV_ERROR); + +@@ -1297,7 +1297,7 @@ + #ifdef OW_I18N + case PANEL_LIST_STRING_WCS: + #endif +- row = *(int *) valist; ++ row = va_arg(valist, int); + node = find_or_create_nth_row(dp, row, FALSE); + #ifdef OW_I18N + if (node != NULL) +@@ -1312,7 +1312,7 @@ + #endif /* OW_I18N */ + + case PANEL_LIST_GLYPH: +- row = *(int *) valist; ++ row = va_arg(valist, int); + node = find_or_create_nth_row(dp, row, FALSE); + return (node ? (Xv_opaque) node->glyph : (Xv_opaque) XV_ERROR); + +@@ -1328,7 +1328,7 @@ + #endif /* OW_I18N */ + + case PANEL_LIST_FONT: +- row = *(int *) valist; ++ row = va_arg(valist, int); + node = find_or_create_nth_row(dp, row, FALSE); + return (node ? (Xv_opaque) node->font : (Xv_opaque) XV_ERROR); + +@@ -1352,7 +1352,7 @@ + + + case PANEL_LIST_INACTIVE: +- row = *(int *) valist; ++ row = va_arg(valist, int); + node = find_or_create_nth_row(dp, row, FALSE); + return (node ? (Xv_opaque) node->f.row_inactive : (Xv_opaque) XV_ERROR); + +@@ -1407,7 +1407,7 @@ + } + + case PANEL_LIST_EXTENSION_DATA: +- row = *(int *) valist; ++ row = va_arg(valist, int); + node = find_or_create_nth_row(dp, row, FALSE); + return (node ? (Xv_opaque) node->exten_data : (Xv_opaque) XV_ERROR); + +@@ -3789,7 +3789,7 @@ + + /* weigh timeval's against multiclick-timeout resource */ + is_multiclick = panel_is_multiclick(ip->panel, +- dp->last_click_row->click_time, ++ &dp->last_click_row->click_time, + &event_time(event) + ); + diff --git a/x11-toolkits/xview/files/patch-lib+libxview+panel+plist.c b/x11-toolkits/xview/files/patch-lib+libxview+panel+plist.c deleted file mode 100644 index f8b343a0c6e4..000000000000 --- a/x11-toolkits/xview/files/patch-lib+libxview+panel+plist.c +++ /dev/null @@ -1,92 +0,0 @@ ---- lib/libxview/panel/p_list.c.orig Tue Jun 29 14:16:48 1993 -+++ lib/libxview/panel/p_list.c Sun Jan 10 01:47:42 1999 -@@ -1239,7 +1239,7 @@ - return ((Xv_opaque) dp->choose_one); - - case PANEL_ITEM_NTH_WINDOW: -- if (*(int *) valist == 0) -+ if (va_arg(valist, int) == 0) - return (Xv_opaque) dp->list_sb; - else - return (Xv_opaque) NULL; -@@ -1266,7 +1266,7 @@ - return (Xv_opaque) dp->list_sb; - - case PANEL_LIST_SELECTED: -- row = *(int *) valist; -+ row = va_arg(valist, int); - node = find_or_create_nth_row(dp, row, FALSE); - return (node ? (Xv_opaque) node->f.selected : (Xv_opaque) XV_ERROR); - -@@ -1278,7 +1278,7 @@ - return -1; /* no rows selected */ - - case PANEL_LIST_NEXT_SELECTED: -- row = *(int *) valist; -+ row = va_arg(valist, int); - node = find_or_create_nth_row(dp, row, FALSE); - if (!node) - return -1; /* specified row doesn't exist */ -@@ -1289,7 +1289,7 @@ - return -1; /* no subsequent row selected */ - - case PANEL_LIST_CLIENT_DATA: -- row = *(int *) valist; -+ row = va_arg(valist, int); - node = find_or_create_nth_row(dp, row, FALSE); - return (node ? (Xv_opaque) node->client_data : (Xv_opaque) XV_ERROR); - -@@ -1297,7 +1297,7 @@ - #ifdef OW_I18N - case PANEL_LIST_STRING_WCS: - #endif -- row = *(int *) valist; -+ row = va_arg(valist, int); - node = find_or_create_nth_row(dp, row, FALSE); - #ifdef OW_I18N - if (node != NULL) -@@ -1312,7 +1312,7 @@ - #endif /* OW_I18N */ - - case PANEL_LIST_GLYPH: -- row = *(int *) valist; -+ row = va_arg(valist, int); - node = find_or_create_nth_row(dp, row, FALSE); - return (node ? (Xv_opaque) node->glyph : (Xv_opaque) XV_ERROR); - -@@ -1328,7 +1328,7 @@ - #endif /* OW_I18N */ - - case PANEL_LIST_FONT: -- row = *(int *) valist; -+ row = va_arg(valist, int); - node = find_or_create_nth_row(dp, row, FALSE); - return (node ? (Xv_opaque) node->font : (Xv_opaque) XV_ERROR); - -@@ -1352,7 +1352,7 @@ - - - case PANEL_LIST_INACTIVE: -- row = *(int *) valist; -+ row = va_arg(valist, int); - node = find_or_create_nth_row(dp, row, FALSE); - return (node ? (Xv_opaque) node->f.row_inactive : (Xv_opaque) XV_ERROR); - -@@ -1407,7 +1407,7 @@ - } - - case PANEL_LIST_EXTENSION_DATA: -- row = *(int *) valist; -+ row = va_arg(valist, int); - node = find_or_create_nth_row(dp, row, FALSE); - return (node ? (Xv_opaque) node->exten_data : (Xv_opaque) XV_ERROR); - -@@ -3789,7 +3789,7 @@ - - /* weigh timeval's against multiclick-timeout resource */ - is_multiclick = panel_is_multiclick(ip->panel, -- dp->last_click_row->click_time, -+ &dp->last_click_row->click_time, - &event_time(event) - ); - diff --git a/x11-toolkits/xview/files/patch-lib+libxview+screen+scrn_get.c b/x11-toolkits/xview/files/patch-lib+libxview+screen+scrn_get.c new file mode 100644 index 000000000000..b60b84fc8b68 --- /dev/null +++ b/x11-toolkits/xview/files/patch-lib+libxview+screen+scrn_get.c @@ -0,0 +1,10 @@ +--- lib/libxview/screen/scrn_get.c.orig Sat Mar 25 23:20:12 2006 ++++ lib/libxview/screen/scrn_get.c Sat Mar 25 23:20:44 2006 +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + + /* Bitmap used for the inactive GC */ + static unsigned short screen_gray50_bitmap[16] = { /* 50% gray pattern */ diff --git a/x11-toolkits/xview/files/patch-lib+libxview+sel+seln.c b/x11-toolkits/xview/files/patch-lib+libxview+sel+seln.c new file mode 100644 index 000000000000..85bb781298c7 --- /dev/null +++ b/x11-toolkits/xview/files/patch-lib+libxview+sel+seln.c @@ -0,0 +1,10 @@ +--- lib/libxview/sel/seln.c.orig 2006-01-04 10:33:29.000000000 +0000 ++++ lib/libxview/sel/seln.c +@@ -69,7 +69,6 @@ selection_get(sel_read, window) + FILE *file; + int c; + int n; +- extern errno; + + *sel = selnull; + (void) win_lockdata(window); diff --git a/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_event.c b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_event.c new file mode 100644 index 000000000000..9b30678f5d4c --- /dev/null +++ b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_event.c @@ -0,0 +1,10 @@ +--- lib/libxview/textsw/txt_event.c.orig 2006-01-04 11:15:27.000000000 +0000 ++++ lib/libxview/textsw/txt_event.c +@@ -22,7 +22,6 @@ static char sccsid[] = "@(#)txt_even + #include + + +-extern int errno; + Pkg_private Notify_error win_post_event(); + Pkg_private void ev_blink_caret(); + diff --git a/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_field.c b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_field.c new file mode 100644 index 000000000000..9922fca49a81 --- /dev/null +++ b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_field.c @@ -0,0 +1,20 @@ +--- lib/libxview/textsw/txt_field.c.orig Sun Mar 26 01:09:21 2006 ++++ lib/libxview/textsw/txt_field.c Sun Mar 26 01:10:42 2006 +@@ -121,8 +121,6 @@ + CHAR marker2[3]; + int marker2_len; + unsigned direction; +- static void textsw_get_match_symbol(); +- + buf = buf + (buf_len - marker1_len); + (void) textsw_get_match_symbol(marker1, marker1_len, + marker2, &marker2_len, &direction); +@@ -152,8 +150,6 @@ + CHAR marker2[3]; + int marker2_len; + unsigned direction; +- static void textsw_get_match_symbol(); +- + (void) textsw_get_match_symbol(marker1, marker1_len, + marker2, &marker2_len, &direction); + if (STRNCMP(buf, marker2, marker2_len) == 0) { diff --git a/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_getkey.c b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_getkey.c new file mode 100644 index 000000000000..fe31eefe991a --- /dev/null +++ b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_getkey.c @@ -0,0 +1,11 @@ +--- lib/libxview/textsw/txt_getkey.c.orig 2006-01-04 11:41:31.000000000 +0000 ++++ lib/libxview/textsw/txt_getkey.c +@@ -21,8 +21,6 @@ static char sccsid[] = "@(#)txt_getk + #include /* For declaration of ev_add_finder */ + #include + +-extern int errno; +- + static void textsw_do_get(); + Pkg_private Es_index textsw_find_mark_internal(); + Pkg_private Es_index textsw_insert_pieces(); diff --git a/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_menu.c b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_menu.c new file mode 100644 index 000000000000..5fdc125a5bee --- /dev/null +++ b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_menu.c @@ -0,0 +1,20 @@ +--- lib/libxview/textsw/txt_menu.c.orig Sun Mar 26 01:01:17 2006 ++++ lib/libxview/textsw/txt_menu.c Sun Mar 26 01:02:52 2006 +@@ -129,6 +129,8 @@ + + + /* VARARGS0 */ ++static int textsw_edit_do_menu_action(), textsw_view_do_menu_action(), ++ textsw_find_do_menu_action(); + static void + textsw_new_menu(folio) + Textsw_folio folio; +@@ -140,8 +142,6 @@ + Frame frame = xv_get(textsw, WIN_FRAME); + Menu_item break_mode_item, undo_cmds_item, find_sel_cmds_item, + select_field_cmds_item; +- static int textsw_edit_do_menu_action(), textsw_view_do_menu_action(), +- textsw_find_do_menu_action(); + int index; + Pkg_private char *textsw_get_extras_filename(); + Pkg_private int textsw_build_extras_menu_items(); diff --git a/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_search.c b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_search.c new file mode 100644 index 000000000000..282f5b3a04e7 --- /dev/null +++ b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_search.c @@ -0,0 +1,11 @@ +--- lib/libxview/textsw/txt_search.c.orig Sun Mar 26 01:12:40 2006 ++++ lib/libxview/textsw/txt_search.c Sun Mar 26 01:13:17 2006 +@@ -79,7 +79,7 @@ + if (direction == EV_FIND_DEFAULT) + first = last_plus_one; + +- STRNCPY(buf, (CHAR *) panel_get(search_panel_items[(int) FIND_STRING_ITEM], ++ (STRNCPY) (buf, (CHAR *) panel_get(search_panel_items[(int) FIND_STRING_ITEM], + #ifdef OW_I18N + PANEL_VALUE_WCS, NULL), + #else diff --git a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_newtxt.c b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_newtxt.c new file mode 100644 index 000000000000..badb327cf000 --- /dev/null +++ b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_newtxt.c @@ -0,0 +1,10 @@ +--- lib/libxview/ttysw/tty_newtxt.c.orig Sun Mar 26 00:27:19 2006 ++++ lib/libxview/ttysw/tty_newtxt.c Sun Mar 26 00:27:49 2006 +@@ -34,6 +34,7 @@ + */ + + ++#include + #include + #include + #include diff --git a/x11-toolkits/xview/files/patch-lib+libxview+win+win_cntral.c b/x11-toolkits/xview/files/patch-lib+libxview+win+win_cntral.c new file mode 100644 index 000000000000..4c3eef0ad980 --- /dev/null +++ b/x11-toolkits/xview/files/patch-lib+libxview+win+win_cntral.c @@ -0,0 +1,10 @@ +--- lib/libxview/win/win_cntral.c.orig 2006-01-04 10:38:51.000000000 +0000 ++++ lib/libxview/win/win_cntral.c +@@ -25,7 +25,6 @@ static char sccsid[] = "@(#)win_cntr + + static Notify_error win_send(); + +-extern int errno; + extern Event xv_last_event; + + void notify_perror(); diff --git a/x11-toolkits/xview/pkg-descr b/x11-toolkits/xview/pkg-descr index d273e7832cd9..9ebfcb723e7f 100644 --- a/x11-toolkits/xview/pkg-descr +++ b/x11-toolkits/xview/pkg-descr @@ -12,6 +12,8 @@ the XView libraries and applications. This package contains the libraries, headers and support files necessary to build XView applications. +WWW: http://en.wikipedia.org/wiki/XView + Source Notes ------------ This version of the XView source corresponds to that provided with -- cgit v1.2.3