$NetBSD: patch-aa,v 1.4 1998/08/07 10:40:28 agc Exp $

--- display.c.old	Sat Jan 10 16:57:37 1998
+++ display.c	Sat Jan 10 17:06:06 1998
@@ -622,7 +622,7 @@
 	      _rl_last_c_pos <= last_invisible && local_prompt)
 	    {
 	      if (term_cr)
-		tputs (term_cr, 1, _rl_output_character_function);
+		tputs (term_cr, 1, (void *)_rl_output_character_function);
 	      _rl_output_some_chars (local_prompt, nleft);
 	      _rl_last_c_pos = nleft;
 	    }
@@ -869,7 +869,7 @@
       term_cr && lendiff > visible_length && _rl_last_c_pos > 0 &&
       od > lendiff && _rl_last_c_pos < last_invisible)
     {
-      tputs (term_cr, 1, _rl_output_character_function);
+      tputs (term_cr, 1, (void *)_rl_output_character_function);
       _rl_output_some_chars (local_prompt, lendiff);
       _rl_last_c_pos = lendiff;
     }
@@ -1039,7 +1039,7 @@
 #if defined (__MSDOS__)
       putc ('\r', rl_outstream);
 #else
-      tputs (term_cr, 1, _rl_output_character_function);
+      tputs (term_cr, 1, (void *)_rl_output_character_function);
 #endif /* !__MSDOS__ */
       _rl_last_c_pos = 0;
     }
@@ -1097,14 +1097,14 @@
     {
       for (i = 0; i < delta; i++)
 	putc ('\n', rl_outstream);
-      tputs (term_cr, 1, _rl_output_character_function);
+      tputs (term_cr, 1, (void *)_rl_output_character_function);
       _rl_last_c_pos = 0;
     }
   else
     {			/* delta < 0 */
       if (term_up && *term_up)
 	for (i = 0; i < -delta; i++)
-	  tputs (term_up, 1, _rl_output_character_function);
+	  tputs (term_up, 1, (void *)_rl_output_character_function);
     }
 #endif /* !__GO32__ */
   _rl_last_v_pos = to;		/* Now TO is here */
@@ -1316,7 +1316,7 @@
 {
 #if !defined (__GO32__)
   if (term_clreol)
-    tputs (term_clreol, 1, _rl_output_character_function);
+    tputs (term_clreol, 1, (void *)_rl_output_character_function);
   else if (count)
 #endif /* !__GO32__ */
     space_to_eol (count);
@@ -1341,7 +1341,7 @@
 {
 #if !defined (__GO32__)
   if (term_clrpag)
-    tputs (term_clrpag, 1, _rl_output_character_function);
+    tputs (term_clrpag, 1, (void *)_rl_output_character_function);
   else
 #endif /* !__GO32__ */
     crlf ();
@@ -1372,7 +1372,7 @@
     {
       char *buffer;
       buffer = tgoto (term_IC, 0, count);
-      tputs (buffer, 1, _rl_output_character_function);
+      tputs (buffer, 1, (void *)_rl_output_character_function);
       _rl_output_some_chars (string, count);
     }
   else
@@ -1381,14 +1381,14 @@
 
       /* If we have to turn on insert-mode, then do so. */
       if (term_im && *term_im)
-	tputs (term_im, 1, _rl_output_character_function);
+	tputs (term_im, 1, (void *)_rl_output_character_function);
 
       /* If there is a special command for inserting characters, then
 	 use that first to open up the space. */
       if (term_ic && *term_ic)
 	{
 	  for (i = count; i--; )
-	    tputs (term_ic, 1, _rl_output_character_function);
+	    tputs (term_ic, 1, (void *)_rl_output_character_function);
 	}
 
       /* Print the text. */
@@ -1397,7 +1397,7 @@
       /* If there is a string to turn off insert mode, we had best use
 	 it now. */
       if (term_ei && *term_ei)
-	tputs (term_ei, 1, _rl_output_character_function);
+	tputs (term_ei, 1, (void *)_rl_output_character_function);
     }
 #endif /* !__GO32__ */
 }
@@ -1426,13 +1426,13 @@
     {
       char *buffer;
       buffer = tgoto (term_DC, count, count);
-      tputs (buffer, count, _rl_output_character_function);
+      tputs (buffer, count, (void *)_rl_output_character_function);
     }
   else
     {
       if (term_dc && *term_dc)
 	while (count--)
-	  tputs (term_dc, 1, _rl_output_character_function);
+	  tputs (term_dc, 1, (void *)_rl_output_character_function);
     }
 #endif /* !__GO32__ */
 }
@@ -1473,7 +1473,7 @@
 {
   if (term_cr)
     {
-      tputs (term_cr, 1, _rl_output_character_function);
+      tputs (term_cr, 1, (void *)_rl_output_character_function);
       _rl_last_c_pos = 0;
     }
 }
@@ -1488,14 +1488,14 @@
      the right thing happens if we have wrapped to a new screen line. */
   if (term_cr)
     {
-      tputs (term_cr, 1, _rl_output_character_function);
+      tputs (term_cr, 1, (void *)_rl_output_character_function);
       _rl_last_c_pos = 0;
       if (term_clreol)
-	tputs (term_clreol, 1, _rl_output_character_function);
+	tputs (term_clreol, 1, (void *)_rl_output_character_function);
       else
 	{
 	  space_to_eol (screenwidth);
-	  tputs (term_cr, 1, _rl_output_character_function);
+	  tputs (term_cr, 1, (void *)_rl_output_character_function);
 	}
       if (_rl_last_v_pos > 0)
 	_rl_move_vert (0);