[commit/obish] Garbage collect USG

[Andrew Cagney <cagney at gnu dot org>]

It is no longer defined (YA!!).

committed,
Andrew

Index: ChangeLog
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.

Index: core-aout.c
===================================================================
RCS file: /cvs/src/src/gdb/core-aout.c,v
retrieving revision 1.9
diff -p -u -r1.9 core-aout.c
--- core-aout.c	22 Jul 2004 01:31:48 -0000	1.9
+++ core-aout.c	7 Sep 2004 21:40:03 -0000
@@ -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)
Index: dbxread.c
===================================================================
RCS file: /cvs/src/src/gdb/dbxread.c,v
retrieving revision 1.72
diff -p -u -r1.72 dbxread.c
--- dbxread.c	10 Aug 2004 21:52:04 -0000	1.72
+++ dbxread.c	7 Sep 2004 21:40:04 -0000
@@ -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
Index: exec.c
===================================================================
RCS file: /cvs/src/src/gdb/exec.c,v
retrieving revision 1.40
diff -p -u -r1.40 exec.c
--- exec.c	30 Jul 2004 19:17:19 -0000	1.40
+++ exec.c	7 Sep 2004 21:40:04 -0000
@@ -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"
Index: i386v-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/i386v-nat.c,v
retrieving revision 1.14
diff -p -u -r1.14 i386v-nat.c
--- i386v-nat.c	19 Jan 2003 04:06:45 -0000	1.14
+++ i386v-nat.c	7 Sep 2004 21:40:04 -0000
@@ -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>
Index: infptrace.c
===================================================================
RCS file: /cvs/src/src/gdb/infptrace.c,v
retrieving revision 1.43
diff -p -u -r1.43 infptrace.c
--- infptrace.c	22 Aug 2004 19:03:41 -0000	1.43
+++ infptrace.c	7 Sep 2004 21:40:04 -0000
@@ -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>
Index: infttrace.c
===================================================================
RCS file: /cvs/src/src/gdb/infttrace.c,v
retrieving revision 1.33
diff -p -u -r1.33 infttrace.c
--- infttrace.c	6 Aug 2004 20:47:25 -0000	1.33
+++ infttrace.c	7 Sep 2004 21:40:04 -0000
@@ -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>
Index: m68klinux-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/m68klinux-nat.c,v
retrieving revision 1.25
diff -p -u -r1.25 m68klinux-nat.c
--- m68klinux-nat.c	24 Jul 2004 01:00:19 -0000	1.25
+++ m68klinux-nat.c	7 Sep 2004 21:40:04 -0000
@@ -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>
Index: mdebugread.c
===================================================================
RCS file: /cvs/src/src/gdb/mdebugread.c,v
retrieving revision 1.62
diff -p -u -r1.62 mdebugread.c
--- mdebugread.c	7 May 2004 14:29:33 -0000	1.62
+++ mdebugread.c	7 Sep 2004 21:40:05 -0000
@@ -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"
 
Index: remote-rdi.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-rdi.c,v
retrieving revision 1.34
diff -p -u -r1.34 remote-rdi.c
--- remote-rdi.c	28 Jul 2004 17:26:27 -0000	1.34
+++ remote-rdi.c	7 Sep 2004 21:40:05 -0000
@@ -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"
Index: remote-sds.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-sds.c,v
retrieving revision 1.32
diff -p -u -r1.32 remote-sds.c
--- remote-sds.c	3 Aug 2004 02:02:23 -0000	1.32
+++ remote-sds.c	7 Sep 2004 21:40:05 -0000
@@ -40,10 +40,6 @@
 #include "gdbcore.h"
 #include "regcache.h"
 
-#ifdef USG
-#include <sys/types.h>
-#endif
-
 #include <signal.h>
 #include "serial.h"
 
Index: remote.c
===================================================================
RCS file: /cvs/src/src/gdb/remote.c,v
retrieving revision 1.145
diff -p -u -r1.145 remote.c
--- remote.c	3 Aug 2004 02:02:23 -0000	1.145
+++ remote.c	7 Sep 2004 21:40:05 -0000
@@ -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"
Index: utils.c
===================================================================
RCS file: /cvs/src/src/gdb/utils.c,v
retrieving revision 1.131
diff -p -u -r1.131 utils.c
--- utils.c	10 Aug 2004 22:36:39 -0000	1.131
+++ utils.c	7 Sep 2004 21:40:06 -0000
@@ -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)
Index: tui/tui.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tui.c,v
retrieving revision 1.51
diff -p -u -r1.51 tui.c
--- tui/tui.c	9 Apr 2004 13:44:02 -0000	1.51
+++ tui/tui.c	7 Sep 2004 21:40:06 -0000
@@ -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;
 }
Index: vx-share/wait.h
===================================================================
RCS file: /cvs/src/src/gdb/vx-share/wait.h,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 wait.h
--- vx-share/wait.h	16 Apr 1999 01:34:28 -0000	1.1.1.1
+++ vx-share/wait.h	7 Sep 2004 21:40:06 -0000
@@ -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