From 7baea9460866303161d1598eddb93a936973ef1d Mon Sep 17 00:00:00 2001
From: Stu Grossman <grossman@cygnus>
Date: Tue, 7 Mar 1995 08:57:32 +0000
Subject: [PATCH] 	* defs.h utils.c remote-hms.c remote-pa.c remote.c: 
 Fix defs and 	usage of fputc_unfiltered and putchar_unfiltered.  Eliminate 
 putc_unfiltered (it's superfluous).

---
 gdb/ChangeLog     | 4 ++++
 gdb/remote-hms.c  | 4 ++--
 gdb/remote-os9k.c | 7 -------
 gdb/remote-pa.c   | 4 ++--
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 605b52a3d35..149c68279a6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
 Tue Mar  7 00:23:47 1995  Stu Grossman  (grossman@cygnus.com)
 
+	* defs.h utils.c remote-hms.c remote-pa.c remote.c:  Fix defs and
+	usage of fputc_unfiltered and putchar_unfiltered.  Eliminate
+	putc_unfiltered (it's superfluous).
+
 	* command.h command.c:  Add var_enum command type.  It's like
 	var_string but allows only only one of the specified strings.
 
diff --git a/gdb/remote-hms.c b/gdb/remote-hms.c
index 4305ef2fb5d..371fb389b25 100644
--- a/gdb/remote-hms.c
+++ b/gdb/remote-hms.c
@@ -521,12 +521,12 @@ hms_wait (pid, status)
 
 	  /* Print out any characters which have been swallowed.  */
 	  for (p = swallowed; p < swallowed_p; ++p)
-	    putc_unfiltered (*p);
+	    putchar_unfiltered (*p);
 	  swallowed_p = swallowed;
 
 	  if ((ch != '\r' && ch != '\n') || swallowed_cr > 10)
 	    {
-	      putc_unfiltered (ch);
+	      putchar_unfiltered (ch);
 	      swallowed_cr = 10;
 	    }
 	  swallowed_cr++;
diff --git a/gdb/remote-os9k.c b/gdb/remote-os9k.c
index 9b6f7bafa40..a4f4e86a6c8 100644
--- a/gdb/remote-os9k.c
+++ b/gdb/remote-os9k.c
@@ -49,13 +49,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "symfile.h"
 #include "objfiles.h"
 #include "gdb-stabs.h"
-#include <termio.h>
-
-#ifdef HAVE_TERMIO
-#  define TERMINAL struct termios
-#else
-#  define TERMINAL struct sgttyb
-#endif
 
 struct monitor_ops *current_monitor;
 struct cmd_list_element *showlist;
diff --git a/gdb/remote-pa.c b/gdb/remote-pa.c
index ed4286bcf3a..58837bf722f 100644
--- a/gdb/remote-pa.c
+++ b/gdb/remote-pa.c
@@ -1196,7 +1196,7 @@ putpkt (buf)
 		case '$':
 		  if (started_error_output)
 		    {
-		      putc_unfiltered ('\n');
+		      putchar_unfiltered ('\n');
 		      started_error_output = 0;
 		    }
 		}
@@ -1227,7 +1227,7 @@ putpkt (buf)
 		      started_error_output = 1;
 		      printf_unfiltered ("putpkt: Junk: ");
 		    }
-		  putc_unfiltered (ch & 0177);
+		  putchar_unfiltered (ch & 0177);
 		}
 	      continue;
 	    }
-- 
2.30.2