To: vim-dev@vim.org

Subject: Patch 7.2.184

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

------------

Patch 7.2.184

Problem:    Some more compiler warnings when using gcc -Wextra.

Solution:   Add UNUSED and type casts.  Autoconf check for wchar_t.

Files:	    src/auto/configure, src/config.h.in, src/configure.in,

	    src/gui_athena.c, src/gui_x11.c, src/gui.c, src/gui_beval.c,

	    src/gui_at_sb.c, src/gui_at_fs.c, src/gui_motif.c,

	    src/gui_xmdlg.c, src/gui_xmebw.c, src/if_python.c, src/window.c,

	    src/workshop.c

*** ../vim-7.2.183/src/auto/configure	2009-05-21 15:19:59.000000000 +0200

--- src/auto/configure	2009-05-21 16:05:01.000000000 +0200

***************

*** 7977,7982 ****

--- 7977,8058 ----

      LDFLAGS="$ac_save_LDFLAGS"

+     { $as_echo "$as_me:$LINENO: checking size of wchar_t is 2 bytes" >&5

+ $as_echo_n "checking size of wchar_t is 2 bytes... " >&6; }

+     if test "${ac_cv_small_wchar_t+set}" = set; then

+   $as_echo_n "(cached) " >&6

+ else

+   if test "$cross_compiling" = yes; then

+   { { $as_echo "$as_me:$LINENO: error: failed to compile test program" >&5

+ $as_echo "$as_me: error: failed to compile test program" >&2;}

+    { (exit 1); exit 1; }; }

+ else

+   cat >conftest.$ac_ext <<_ACEOF

+ /* confdefs.h.  */

+ _ACEOF

+ cat confdefs.h >>conftest.$ac_ext

+ cat >>conftest.$ac_ext <<_ACEOF

+ /* end confdefs.h.  */

+ 

+ #include <X11/Xlib.h>

+ #if STDC_HEADERS

+ # include <stdlib.h>

+ # include <stddef.h>

+ #endif

+ 		main()

+ 		{

+ 		  if (sizeof(wchar_t) <= 2)

+ 		    exit(1);

+ 		  exit(0);

+ 		}

+ _ACEOF

+ rm -f conftest$ac_exeext

+ if { (ac_try="$ac_link"

+ case "(($ac_try" in

+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

+   *) ac_try_echo=$ac_try;;

+ esac

+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

+ $as_echo "$ac_try_echo") >&5

+   (eval "$ac_link") 2>&5

+   ac_status=$?

+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

+   { (case "(($ac_try" in

+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

+   *) ac_try_echo=$ac_try;;

+ esac

+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

+ $as_echo "$ac_try_echo") >&5

+   (eval "$ac_try") 2>&5

+   ac_status=$?

+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

+   (exit $ac_status); }; }; then

+   ac_cv_small_wchar_t="no"

+ else

+   $as_echo "$as_me: program exited with status $ac_status" >&5

+ $as_echo "$as_me: failed program was:" >&5

+ sed 's/^/| /' conftest.$ac_ext >&5

+ 

+ ( exit $ac_status )

+ ac_cv_small_wchar_t="yes"

+ fi

+ rm -rf conftest.dSYM

+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

+ fi

+ 

+ 

+ fi

+ 

+     { $as_echo "$as_me:$LINENO: result: $ac_cv_small_wchar_t" >&5

+ $as_echo "$ac_cv_small_wchar_t" >&6; }

+     if test "x$ac_cv_small_wchar_t" = "xyes" ; then

+       cat >>confdefs.h <<\_ACEOF

+ #define SMALL_WCHAR_T 1

+ _ACEOF

+ 

+     fi

+ 

    fi

  fi

***************

*** 15417,15423 ****

- 

  bcopy_test_prog='

  #include "confdefs.h"

  #ifdef HAVE_STRING_H

--- 15493,15498 ----

*** ../vim-7.2.183/src/config.h.in	2009-05-14 22:19:19.000000000 +0200

--- src/config.h.in	2009-05-21 15:44:24.000000000 +0200

***************

*** 39,44 ****

--- 39,47 ----

  /* Defined to the size of an int */

  #undef SIZEOF_INT

+ /* Define when wchar_t is only 2 bytes. */

+ #undef SMALL_WCHAR_T

+ 

  /*

   * If we cannot trust one of the following from the libraries, we use our

   * own safe but probably slower vim_memmove().

*** ../vim-7.2.183/src/configure.in	2009-05-21 15:19:59.000000000 +0200

--- src/configure.in	2009-05-21 16:04:56.000000000 +0200

***************

*** 1193,1198 ****

--- 1193,1220 ----

      LDFLAGS="$ac_save_LDFLAGS"

+     AC_MSG_CHECKING(size of wchar_t is 2 bytes)

+     AC_CACHE_VAL(ac_cv_small_wchar_t,

+ 	[AC_TRY_RUN([

+ #include <X11/Xlib.h>

+ #if STDC_HEADERS

+ # include <stdlib.h>

+ # include <stddef.h>

+ #endif

+ 		main()

+ 		{

+ 		  if (sizeof(wchar_t) <= 2)

+ 		    exit(1);

+ 		  exit(0);

+ 		}],

+ 		ac_cv_small_wchar_t="no",

+ 		ac_cv_small_wchar_t="yes",

+ 		AC_MSG_ERROR(failed to compile test program))])

+     AC_MSG_RESULT($ac_cv_small_wchar_t)

+     if test "x$ac_cv_small_wchar_t" = "xyes" ; then

+       AC_DEFINE(SMALL_WCHAR_T)

+     fi

+ 

    fi

  fi

***************

*** 2881,2887 ****

  AC_MSG_RESULT($ac_cv_sizeof_int)

  AC_DEFINE_UNQUOTED(SIZEOF_INT, $ac_cv_sizeof_int)

- 

  dnl Check for memmove() before bcopy(), makes memmove() be used when both are

  dnl present, fixes problem with incompatibility between Solaris 2.4 and 2.5.

--- 2903,2908 ----

*** ../vim-7.2.183/src/gui_athena.c	2008-06-24 23:00:51.000000000 +0200

--- src/gui_athena.c	2009-05-21 16:39:43.000000000 +0200

***************

*** 86,95 ****

   * Scrollbar callback (XtNjumpProc) for when the scrollbar is dragged with the

   * left or middle mouse button.

   */

- /* ARGSUSED */

      static void

  gui_athena_scroll_cb_jump(w, client_data, call_data)

!     Widget	w;

      XtPointer	client_data, call_data;

  {

      scrollbar_T *sb, *sb_info;

--- 86,94 ----

   * Scrollbar callback (XtNjumpProc) for when the scrollbar is dragged with the

   * left or middle mouse button.

   */

      static void

  gui_athena_scroll_cb_jump(w, client_data, call_data)

!     Widget	w UNUSED;

      XtPointer	client_data, call_data;

  {

      scrollbar_T *sb, *sb_info;

***************

*** 122,131 ****

   * Scrollbar callback (XtNscrollProc) for paging up or down with the left or

   * right mouse buttons.

   */

- /* ARGSUSED */

      static void

  gui_athena_scroll_cb_scroll(w, client_data, call_data)

!     Widget	w;

      XtPointer	client_data, call_data;

  {

      scrollbar_T *sb, *sb_info;

--- 121,129 ----

   * Scrollbar callback (XtNscrollProc) for paging up or down with the left or

   * right mouse buttons.

   */

      static void

  gui_athena_scroll_cb_scroll(w, client_data, call_data)

!     Widget	w UNUSED;

      XtPointer	client_data, call_data;

  {

      scrollbar_T *sb, *sb_info;

***************

*** 492,498 ****

      if (menu->icon_builtin || gui_find_bitmap(menu->name, buf, "xpm") == FAIL)

      {

  	if (menu->iconidx >= 0 && menu->iconidx

! 		   < (sizeof(built_in_pixmaps) / sizeof(built_in_pixmaps[0])))

  	    xpm = built_in_pixmaps[menu->iconidx];

  	else

  	    xpm = tb_blank_xpm;

--- 490,496 ----

      if (menu->icon_builtin || gui_find_bitmap(menu->name, buf, "xpm") == FAIL)

      {

  	if (menu->iconidx >= 0 && menu->iconidx

! 	      < (int)(sizeof(built_in_pixmaps) / sizeof(built_in_pixmaps[0])))

  	    xpm = built_in_pixmaps[menu->iconidx];

  	else

  	    xpm = tb_blank_xpm;

***************

*** 763,769 ****

      XtGetValues(XtParent(widget), args, n);

      retval = num_children;

!     for (i = 0; i < num_children; ++i)

      {

  	Widget	current = children[i];

  	vimmenu_T	*menu = NULL;

--- 761,767 ----

      XtGetValues(XtParent(widget), args, n);

      retval = num_children;

!     for (i = 0; i < (int)num_children; ++i)

      {

  	Widget	current = children[i];

  	vimmenu_T	*menu = NULL;

***************

*** 780,790 ****

      return retval;

  }

- /* ARGSUSED */

      void

  gui_mch_add_menu(menu, idx)

      vimmenu_T	*menu;

!     int		idx;

  {

      char_u	*pullright_name;

      Dimension	height, space, border;

--- 778,787 ----

      return retval;

  }

      void

  gui_mch_add_menu(menu, idx)

      vimmenu_T	*menu;

!     int		idx UNUSED;

  {

      char_u	*pullright_name;

      Dimension	height, space, border;

***************

*** 869,875 ****

  	    XtVaGetValues(parent->submenu_id, XtNchildren, &children,

  					      XtNnumChildren, &num_children,

  					      NULL);

! 	    for (i = 0; i < num_children; ++i)

  	    {

  		XtVaSetValues(children[i],

  			      XtNrightMargin, puller_width,

--- 866,872 ----

  	    XtVaGetValues(parent->submenu_id, XtNchildren, &children,

  					      XtNnumChildren, &num_children,

  					      NULL);

! 	    for (i = 0; i < (int)num_children; ++i)

  	    {

  		XtVaSetValues(children[i],

  			      XtNrightMargin, puller_width,

***************

*** 913,919 ****

      XtVaGetValues(id, XtNchildren, &children,

  		      XtNnumChildren, &num_children,

  		      NULL);

!     for (i = 0; i < num_children; ++i)

      {

  	if (children[i] == ignore)

  	    continue;

--- 910,916 ----

      XtVaGetValues(id, XtNchildren, &children,

  		      XtNnumChildren, &num_children,

  		      NULL);

!     for (i = 0; i < (int)num_children; ++i)

      {

  	if (children[i] == ignore)

  	    continue;

***************

*** 1175,1185 ****

      return pname;

  }

- /* ARGSUSED */

      void

  gui_mch_add_menu_item(menu, idx)

      vimmenu_T	*menu;

!     int		idx;

  {

      vimmenu_T	*parent = menu->parent;

--- 1172,1181 ----

      return pname;

  }

      void

  gui_mch_add_menu_item(menu, idx)

      vimmenu_T	*menu;

!     int		idx UNUSED;

  {

      vimmenu_T	*parent = menu->parent;

***************

*** 1444,1450 ****

  		XtNchildren,	    &children,

  		XtNnumChildren,	    &numChildren,

  		NULL);

! 	for (i = 0; i < numChildren; i++)

  	{

  	    whgt = 0;

--- 1440,1446 ----

  		XtNchildren,	    &children,

  		XtNnumChildren,	    &numChildren,

  		NULL);

! 	for (i = 0; i < (int)numChildren; i++)

  	{

  	    whgt = 0;

***************

*** 1473,1482 ****

  #endif

- /* ARGSUSED */

      void

  gui_mch_toggle_tearoffs(enable)

!     int		enable;

  {

      /* no tearoff menus */

  }

--- 1469,1477 ----

  #endif

      void

  gui_mch_toggle_tearoffs(enable)

!     int		enable UNUSED;

  {

      /* no tearoff menus */

  }

***************

*** 1537,1543 ****

  	    else

  		get_left_margin = True;

! 	    for (i = 0; i < num_children; ++i)

  	    {

  		if (children[i] == menu->id)

  		    continue;

--- 1532,1538 ----

  	    else

  		get_left_margin = True;

! 	    for (i = 0; i < (int)num_children; ++i)

  	    {

  		if (children[i] == menu->id)

  		    continue;

***************

*** 1645,1655 ****

      }

  }

- /*ARGSUSED*/

      static void

  gui_athena_menu_timeout(client_data, id)

      XtPointer	    client_data;

!     XtIntervalId    *id;

  {

      Widget  w = (Widget)client_data;

      Widget  popup;

--- 1640,1649 ----

      }

  }

      static void

  gui_athena_menu_timeout(client_data, id)

      XtPointer	    client_data;

!     XtIntervalId    *id UNUSED;

  {

      Widget  w = (Widget)client_data;

      Widget  popup;

***************

*** 1678,1689 ****

   *

   * This is called when XtPopup() is called.

   */

- /*ARGSUSED*/

      static void

  gui_athena_popup_callback(w, client_data, call_data)

      Widget	w;

      XtPointer	client_data;

!     XtPointer	call_data;

  {

      /* Assumption: XtIsSubclass(XtParent(w),simpleMenuWidgetClass) */

      vimmenu_T	*menu = (vimmenu_T *)client_data;

--- 1672,1682 ----

   *

   * This is called when XtPopup() is called.

   */

      static void

  gui_athena_popup_callback(w, client_data, call_data)

      Widget	w;

      XtPointer	client_data;

!     XtPointer	call_data UNUSED;

  {

      /* Assumption: XtIsSubclass(XtParent(w),simpleMenuWidgetClass) */

      vimmenu_T	*menu = (vimmenu_T *)client_data;

***************

*** 1711,1717 ****

  		     NULL);

  }

- /* ARGSUSED */

      static void

  gui_athena_popdown_submenus_action(w, event, args, nargs)

      Widget	w;

--- 1704,1709 ----

***************

*** 1756,1762 ****

      return False;

  }

- /* ARGSUSED */

      static void

  gui_athena_delayed_arm_action(w, event, args, nargs)

      Widget	w;

--- 1748,1753 ----

***************

*** 1837,1843 ****

       * (XtIsSubclass(popup,simpleMenuWidgetClass) == True) */

  }

- /* ARGSUSED */

      void

  gui_mch_show_popupmenu(menu)

      vimmenu_T *menu;

--- 1828,1833 ----

***************

*** 2046,2060 ****

   * Put up a file requester.

   * Returns the selected name in allocated memory, or NULL for Cancel.

   */

- /* ARGSUSED */

      char_u *

  gui_mch_browse(saving, title, dflt, ext, initdir, filter)

!     int		saving;		/* select file to write */

!     char_u	*title;		/* not used (title for the window) */

!     char_u	*dflt;		/* not used (default name) */

!     char_u	*ext;		/* not used (extension added) */

      char_u	*initdir;	/* initial directory, NULL for current dir */

!     char_u	*filter;	/* not used (file name filter) */

  {

      Position x, y;

      char_u	dirbuf[MAXPATHL];

--- 2036,2049 ----

   * Put up a file requester.

   * Returns the selected name in allocated memory, or NULL for Cancel.

   */

      char_u *

  gui_mch_browse(saving, title, dflt, ext, initdir, filter)

!     int		saving UNUSED;	/* select file to write */

!     char_u	*title;		/* title for the window */

!     char_u	*dflt;		/* default name */

!     char_u	*ext UNUSED;	/* extension added */

      char_u	*initdir;	/* initial directory, NULL for current dir */

!     char_u	*filter UNUSED;	/* file name filter */

  {

      Position x, y;

      char_u	dirbuf[MAXPATHL];

***************

*** 2100,2112 ****

   * Callback function for the textfield.  When CR is hit this works like

   * hitting the "OK" button, ESC like "Cancel".

   */

- /* ARGSUSED */

      static void

  keyhit_callback(w, client_data, event, cont)

!     Widget		w;

!     XtPointer		client_data;

      XEvent		*event;

!     Boolean		*cont;

  {

      char	buf[2];

--- 2089,2100 ----

   * Callback function for the textfield.  When CR is hit this works like

   * hitting the "OK" button, ESC like "Cancel".

   */

      static void

  keyhit_callback(w, client_data, event, cont)

!     Widget		w UNUSED;

!     XtPointer		client_data UNUSED;

      XEvent		*event;

!     Boolean		*cont UNUSED;

  {

      char	buf[2];

***************

*** 2119,2130 ****

      }

  }

- /* ARGSUSED */

      static void

  butproc(w, client_data, call_data)

!     Widget	w;

      XtPointer	client_data;

!     XtPointer	call_data;

  {

      dialogStatus = (int)(long)client_data + 1;

  }

--- 2107,2117 ----

      }

  }

      static void

  butproc(w, client_data, call_data)

!     Widget	w UNUSED;

      XtPointer	client_data;

!     XtPointer	call_data UNUSED;

  {

      dialogStatus = (int)(long)client_data + 1;

  }

***************

*** 2132,2158 ****

  /*

   * Function called when dialog window closed.

   */

- /*ARGSUSED*/

      static void

  dialog_wm_handler(w, client_data, event, dum)

!     Widget	w;

!     XtPointer	client_data;

      XEvent	*event;

!     Boolean	*dum;

  {

      if (event->type == ClientMessage

! 	    && ((XClientMessageEvent *)event)->data.l[0] == dialogatom)

  	dialogStatus = 0;

  }

- /* ARGSUSED */

      int

  gui_mch_dialog(type, title, message, buttons, dfltbutton, textfield)

!     int		type;

      char_u	*title;

      char_u	*message;

      char_u	*buttons;

!     int		dfltbutton;

      char_u	*textfield;

  {

      char_u		*buts;

--- 2119,2143 ----

  /*

   * Function called when dialog window closed.

   */

      static void

  dialog_wm_handler(w, client_data, event, dum)

!     Widget	w UNUSED;

!     XtPointer	client_data UNUSED;

      XEvent	*event;

!     Boolean	*dum UNUSED;

  {

      if (event->type == ClientMessage

! 	    && (Atom)((XClientMessageEvent *)event)->data.l[0] == dialogatom)

  	dialogStatus = 0;

  }

      int

  gui_mch_dialog(type, title, message, buttons, dfltbutton, textfield)

!     int		type UNUSED;

      char_u	*title;

      char_u	*message;

      char_u	*buttons;

!     int		dfltbutton UNUSED;

      char_u	*textfield;

  {

      char_u		*buts;

*** ../vim-7.2.183/src/gui_x11.c	2009-02-24 04:11:07.000000000 +0100

--- src/gui_x11.c	2009-05-21 16:47:02.000000000 +0200

***************

*** 570,591 ****

   * Call-back routines.

   */

- /* ARGSUSED */

      static void

  gui_x11_timer_cb(timed_out, interval_id)

      XtPointer	    timed_out;

!     XtIntervalId    *interval_id;

  {

      *((int *)timed_out) = TRUE;

  }

- /* ARGSUSED */

      static void

  gui_x11_visibility_cb(w, dud, event, dum)

!     Widget	w;

!     XtPointer	dud;

      XEvent	*event;

!     Boolean	*dum;

  {

      if (event->type != VisibilityNotify)

  	return;

--- 570,589 ----

   * Call-back routines.

   */

      static void

  gui_x11_timer_cb(timed_out, interval_id)

      XtPointer	    timed_out;

!     XtIntervalId    *interval_id UNUSED;

  {

      *((int *)timed_out) = TRUE;

  }

      static void

  gui_x11_visibility_cb(w, dud, event, dum)

!     Widget	w UNUSED;

!     XtPointer	dud UNUSED;

      XEvent	*event;

!     Boolean	*dum UNUSED;

  {

      if (event->type != VisibilityNotify)

  	return;

***************

*** 603,615 ****

      gui_mch_update();

  }

- /* ARGSUSED */

      static void

  gui_x11_expose_cb(w, dud, event, dum)

!     Widget	w;

!     XtPointer	dud;

      XEvent	*event;

!     Boolean	*dum;

  {

      XExposeEvent	*gevent;

      int			new_x;

--- 601,612 ----

      gui_mch_update();

  }

      static void

  gui_x11_expose_cb(w, dud, event, dum)

!     Widget	w UNUSED;

!     XtPointer	dud UNUSED;

      XEvent	*event;

!     Boolean	*dum UNUSED;

  {

      XExposeEvent	*gevent;

      int			new_x;

***************

*** 680,692 ****

  }

  #endif

- /* ARGSUSED */

      static void

  gui_x11_resize_window_cb(w, dud, event, dum)

!     Widget	w;

!     XtPointer	dud;

      XEvent	*event;

!     Boolean	*dum;

  {

      static int lastWidth, lastHeight;

--- 677,688 ----

  }

  #endif

      static void

  gui_x11_resize_window_cb(w, dud, event, dum)

!     Widget	w UNUSED;

!     XtPointer	dud UNUSED;

      XEvent	*event;

!     Boolean	*dum UNUSED;

  {

      static int lastWidth, lastHeight;

***************

*** 727,761 ****

  #endif

  }

- /* ARGSUSED */

      static void

  gui_x11_focus_change_cb(w, data, event, dum)

!     Widget	w;

!     XtPointer	data;

      XEvent	*event;

!     Boolean	*dum;

  {

      gui_focus_change(event->type == FocusIn);

  }

- /* ARGSUSED */

      static void

  gui_x11_enter_cb(w, data, event, dum)

!     Widget	w;

!     XtPointer	data;

!     XEvent	*event;

!     Boolean	*dum;

  {

      gui_focus_change(TRUE);

  }

- /* ARGSUSED */

      static void

  gui_x11_leave_cb(w, data, event, dum)

!     Widget	w;

!     XtPointer	data;

!     XEvent	*event;

!     Boolean	*dum;

  {

      gui_focus_change(FALSE);

  }

--- 723,754 ----

  #endif

  }

      static void

  gui_x11_focus_change_cb(w, data, event, dum)

!     Widget	w UNUSED;

!     XtPointer	data UNUSED;

      XEvent	*event;

!     Boolean	*dum UNUSED;

  {

      gui_focus_change(event->type == FocusIn);

  }

      static void

  gui_x11_enter_cb(w, data, event, dum)

!     Widget	w UNUSED;

!     XtPointer	data UNUSED;

!     XEvent	*event UNUSED;

!     Boolean	*dum UNUSED;

  {

      gui_focus_change(TRUE);

  }

      static void

  gui_x11_leave_cb(w, data, event, dum)

!     Widget	w UNUSED;

!     XtPointer	data UNUSED;

!     XEvent	*event UNUSED;

!     Boolean	*dum UNUSED;

  {

      gui_focus_change(FALSE);

  }

***************

*** 766,778 ****

  # endif

  #endif

- /* ARGSUSED */

      void

  gui_x11_key_hit_cb(w, dud, event, dum)

!     Widget	w;

!     XtPointer	dud;

      XEvent	*event;

!     Boolean	*dum;

  {

      XKeyPressedEvent	*ev_press;

  #ifdef FEAT_XIM

--- 759,770 ----

  # endif

  #endif

      void

  gui_x11_key_hit_cb(w, dud, event, dum)

!     Widget	w UNUSED;

!     XtPointer	dud UNUSED;

      XEvent	*event;

!     Boolean	*dum UNUSED;

  {

      XKeyPressedEvent	*ev_press;

  #ifdef FEAT_XIM

***************

*** 1078,1090 ****

  #endif

  }

- /* ARGSUSED */

      static void

  gui_x11_mouse_cb(w, dud, event, dum)

!     Widget	w;

!     XtPointer	dud;

      XEvent	*event;

!     Boolean	*dum;

  {

      static XtIntervalId timer = (XtIntervalId)0;

      static int	timed_out = TRUE;

--- 1070,1081 ----

  #endif

  }

      static void

  gui_x11_mouse_cb(w, dud, event, dum)

!     Widget	w UNUSED;

!     XtPointer	dud UNUSED;

      XEvent	*event;

!     Boolean	*dum UNUSED;

  {

      static XtIntervalId timer = (XtIntervalId)0;

      static int	timed_out = TRUE;

***************

*** 1210,1220 ****

      while (arg < *argc)

      {

  	/* Look for argv[arg] in cmdline_options[] table */

! 	for (i = 0; i < XtNumber(cmdline_options); i++)

  	    if (strcmp(argv[arg], cmdline_options[i].option) == 0)

  		break;

! 	if (i < XtNumber(cmdline_options))

  	{

  	    /* Remember finding "-rv" or "-reverse" */

  	    if (strcmp("-rv", argv[arg]) == 0

--- 1201,1211 ----

      while (arg < *argc)

      {

  	/* Look for argv[arg] in cmdline_options[] table */

! 	for (i = 0; i < (int)XtNumber(cmdline_options); i++)

  	    if (strcmp(argv[arg], cmdline_options[i].option) == 0)

  		break;

! 	if (i < (int)XtNumber(cmdline_options))

  	{

  	    /* Remember finding "-rv" or "-reverse" */

  	    if (strcmp("-rv", argv[arg]) == 0

***************

*** 1319,1330 ****

  static void local_xsmp_handle_requests __ARGS((XtPointer c, int *s, XtInputId *i));

- /*ARGSUSED*/

      static void

  local_xsmp_handle_requests(c, s, i)

!     XtPointer	c;

!     int		*s;

!     XtInputId	*i;

  {

      if (xsmp_handle_requests() == FAIL)