2004-09-07 Andrew Cagney <cagney@gnu.org>

	* vx-share/wait.h: Delete #ifdef USG.
	* utils.c (request_quit): Ditto.
	* tui/tui.c (tui_reset): Ditto.
	* remote.c: Ditto.
	* remote-sds.c: Ditto.
	* remote-rdi.c: Ditto.
	* mdebugread.c: Ditto.
	* m68klinux-nat.c: Ditto.
	* infttrace.c: Ditto.
	* infptrace.c: Ditto.
	* i386v-nat.c: Ditto.
	* exec.c: Ditto.
	* dbxread.c: Ditto.
	* core-aout.c: Ditto.

15 files changed, 25 insertions, 68 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 91d851e..a610ad9 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,20 @@
+2004-09-07  Andrew Cagney  <cagney@gnu.org>
+
+	* vx-share/wait.h: Delete #ifdef USG.
+	* utils.c (request_quit): Ditto.
+	* tui/tui.c (tui_reset): Ditto.
+	* remote.c: Ditto.
+	* remote-sds.c: Ditto.
+	* remote-rdi.c: Ditto.
+	* mdebugread.c: Ditto.
+	* m68klinux-nat.c: Ditto.
+	* infttrace.c: Ditto.
+	* infptrace.c: Ditto.
+	* i386v-nat.c: Ditto.
+	* exec.c: Ditto.
+	* dbxread.c: Ditto.
+	* core-aout.c: Ditto.
+
 2004-09-05  Joel Brobecker  <brobecker@gnat.com>
 
 	* mips-tdep.c (mips_insn16_frame_cache): Fix parameter in call to
diff --git a/gdb/core-aout.c b/gdb/core-aout.c
index 2246926..659c818 100644
--- a/gdb/core-aout.c
+++ b/gdb/core-aout.c
@@ -41,12 +41,10 @@
 #include "regcache.h"
 
 /* These are needed on various systems to expand REGISTER_U_ADDR.  */
-#ifndef USG
 #include "gdb_dirent.h"
 #include <sys/file.h>
 #include "gdb_stat.h"
 #include <sys/user.h>
-#endif
 
 #ifndef CORE_REGISTER_ADDR
 #define CORE_REGISTER_ADDR(regno, regptr) register_addr(regno, regptr)
diff --git a/gdb/dbxread.c b/gdb/dbxread.c
index e537744..5436d4a 100644
--- a/gdb/dbxread.c
+++ b/gdb/dbxread.c
@@ -37,7 +37,7 @@
 #include "defs.h"
 #include "gdb_string.h"
 
-#if defined(USG) || defined(__CYGNUSCLIB__)
+#if defined(__CYGNUSCLIB__)
 #include <sys/types.h>
 #include <fcntl.h>
 #endif
diff --git a/gdb/exec.c b/gdb/exec.c
index e0652fb..4ff345a 100644
--- a/gdb/exec.c
+++ b/gdb/exec.c
@@ -33,10 +33,6 @@
 #include "value.h"
 #include "exec.h"
 
-#ifdef USG
-#include <sys/types.h>
-#endif
-
 #include <fcntl.h>
 #include "readline/readline.h"
 #include "gdb_string.h"
diff --git a/gdb/i386v-nat.c b/gdb/i386v-nat.c
index 678eabc..bae8406 100644
--- a/gdb/i386v-nat.c
+++ b/gdb/i386v-nat.c
@@ -35,10 +35,6 @@
 #include "language.h"
 #include "gdbcore.h"
 
-#ifdef USG
-#include <sys/types.h>
-#endif
-
 #include <sys/param.h>
 #include <sys/dir.h>
 #include <signal.h>
diff --git a/gdb/infptrace.c b/gdb/infptrace.c
index 0c59d8f..fb7736c 100644
--- a/gdb/infptrace.c
+++ b/gdb/infptrace.c
@@ -32,10 +32,6 @@
 #include "gdb_wait.h"
 #include "gdb_string.h"
 
-#ifdef USG
-#include <sys/types.h>
-#endif
-
 #include <sys/param.h>
 #include "gdb_dirent.h"
 #include <signal.h>
diff --git a/gdb/infttrace.c b/gdb/infttrace.c
index d62c4bd..fcb4d02 100644
--- a/gdb/infttrace.c
+++ b/gdb/infttrace.c
@@ -46,10 +46,6 @@
 #undef  NO_FLAGS
 #endif
 
-#ifdef USG
-#include <sys/types.h>
-#endif
-
 #include <sys/param.h>
 #include <sys/dir.h>
 #include <signal.h>
diff --git a/gdb/m68klinux-nat.c b/gdb/m68klinux-nat.c
index 70a40b7..30a4c9d 100644
--- a/gdb/m68klinux-nat.c
+++ b/gdb/m68klinux-nat.c
@@ -30,10 +30,6 @@
 
 #include "m68k-tdep.h"
 
-#ifdef USG
-#include <sys/types.h>
-#endif
-
 #include <sys/param.h>
 #include <sys/dir.h>
 #include <signal.h>
diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c
index c0165ab..5207b7e 100644
--- a/gdb/mdebugread.c
+++ b/gdb/mdebugread.c
@@ -76,10 +76,6 @@ typedef struct mips_extra_func_info
 #endif
 #endif
 
-#ifdef USG
-#include <sys/types.h>
-#endif
-
 #include "gdb_stat.h"
 #include "gdb_string.h"
 
diff --git a/gdb/remote-rdi.c b/gdb/remote-rdi.c
index 50d1fbf..1c14a03 100644
--- a/gdb/remote-rdi.c
+++ b/gdb/remote-rdi.c
@@ -38,10 +38,6 @@
 #include "regcache.h"
 #include "arm-tdep.h"
 
-#ifdef USG
-#include <sys/types.h>
-#endif
-
 #include <signal.h>
 
 #include "rdi-share/ardi.h"
diff --git a/gdb/remote-sds.c b/gdb/remote-sds.c
index 7f16c74..5b4b389 100644
--- a/gdb/remote-sds.c
+++ b/gdb/remote-sds.c
@@ -40,10 +40,6 @@
 #include "gdbcore.h"
 #include "regcache.h"
 
-#ifdef USG
-#include <sys/types.h>
-#endif
-
 #include <signal.h>
 #include "serial.h"
 
diff --git a/gdb/remote.c b/gdb/remote.c
index 30ae26d..a081064f 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -43,9 +43,6 @@
 
 #include <ctype.h>
 #include <sys/time.h>
-#ifdef USG
-#include <sys/types.h>
-#endif
 
 #include "event-loop.h"
 #include "event-top.h"
diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c
index d88998a..e9a9b1b 100644
--- a/gdb/tui/tui.c
+++ b/gdb/tui/tui.c
@@ -485,9 +485,9 @@ tui_reset (void)
      ** reset the teletype mode bits to a sensible state.
      ** Copied tset.c
    */
-#if ! defined (USG) && defined (TIOCGETC)
+#if defined (TIOCGETC)
   struct tchars tbuf;
-#endif /* !USG && TIOCGETC */
+#endif /* TIOCGETC */
 #ifdef UCB_NTTY
   struct ltchars ltc;
 
@@ -503,7 +503,6 @@ tui_reset (void)
       ioctl (FILEDES, TIOCSLTC, &ltc);
     }
 #endif /* UCB_NTTY */
-#ifndef USG
 #ifdef TIOCGETC
   ioctl (FILEDES, TIOCGETC, &tbuf);
   tbuf.t_intrc = CHK (tbuf.t_intrc, CTRL ('?'));
@@ -520,27 +519,6 @@ tui_reset (void)
 #endif /* CBREAK */
 		     | VTDELAY | ALLDELAY);
   mode.sg_flags |= XTABS | ECHO | CRMOD | ANYP;
-#else /*USG */
-  ioctl (FILEDES, TCGETA, &mode);
-  mode.c_cc[VINTR] = CHK (mode.c_cc[VINTR], CTRL ('?'));
-  mode.c_cc[VQUIT] = CHK (mode.c_cc[VQUIT], CTRL ('\\'));
-  mode.c_cc[VEOF] = CHK (mode.c_cc[VEOF], CTRL ('D'));
-
-  mode.c_iflag &= ~(IGNBRK | PARMRK | INPCK | INLCR | IGNCR | IUCLC | IXOFF);
-  mode.c_iflag |= (BRKINT | ISTRIP | ICRNL | IXON);
-  mode.c_oflag &= ~(OLCUC | OCRNL | ONOCR | ONLRET | OFILL | OFDEL |
-		    NLDLY | CRDLY | TABDLY | BSDLY | VTDLY | FFDLY);
-  mode.c_oflag |= (OPOST | ONLCR);
-  mode.c_cflag &= ~(CSIZE | PARODD | CLOCAL);
-#ifndef hp9000s800
-  mode.c_cflag |= (CS8 | CREAD);
-#else /*hp9000s800 */
-  mode.c_cflag |= (CS8 | CSTOPB | CREAD);
-#endif /* hp9000s800 */
-  mode.c_lflag &= ~(XCASE | ECHONL | NOFLSH);
-  mode.c_lflag |= (ISIG | ICANON | ECHO | ECHOK);
-  ioctl (FILEDES, TCSETAW, &mode);
-#endif /* USG */
 
   return;
 }
diff --git a/gdb/utils.c b/gdb/utils.c
index be99780..e350c25 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -974,9 +974,8 @@ void
 request_quit (int signo)
 {
   quit_flag = 1;
-  /* Restore the signal handler.  Harmless with BSD-style signals, needed
-     for System V-style signals.  So just always do it, rather than worrying
-     about USG defines and stuff like that.  */
+  /* Restore the signal handler.  Harmless with BSD-style signals,
+     needed for System V-style signals.  */
   signal (signo, request_quit);
 
   if (immediate_quit)
diff --git a/gdb/vx-share/wait.h b/gdb/vx-share/wait.h
index cb8d1b5..f4670c0 100644
--- a/gdb/vx-share/wait.h
+++ b/gdb/vx-share/wait.h
@@ -10,9 +10,9 @@ modification history
 01a,05jun90,llk  borrowed.
 */
 
-/* Define how to access the structure that the wait system call stores.
-   On many systems, there is a structure defined for this.
-   But on vanilla-ish USG systems there is not.  */
+/* Define how to access the structure that the wait system call
+   stores.  On many systems, there is a structure defined for
+   this.  */
 
 #ifndef HAVE_WAIT_STRUCT
 #define WAITTYPE int