delete redundant definition of STARTUP_INFERIOR_TRAPS_EXPECTED.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b8d6c2ad8e424901ea796ac2594bdd42d506d80a..b5671eb884378e5008b776b436197cac10099e09 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 Mon Jan  4 15:05:29 1999  David Taylor  <taylor@texas.cygnus.com>
 
+       * inferior.h (START_INFERIOR_TRAPS_EXPECTED): delete,
+       already defined in tm.h.
+
        * inftarg.c: change <sys/unistd.h> to <unistd.h> and
        conditionalize its inclusion.
        * infttrace.c: ditto.

diff --git a/gdb/inferior.h b/gdb/inferior.h
index e228fcec89105e7413bf993e03561a1b660419f8..5b72c921a1b79b06094531dbb182413d4dc1e20f 100644 (file)
--- a/gdb/inferior.h
+++ b/gdb/inferior.h
@@ -450,22 +450,22 @@ extern CORE_ADDR text_end;
 #endif
 
 /* If STARTUP_WITH_SHELL is set, GDB's "run" 
- * will attempts to start up the debugee under a shell.
- * This is in order for argument-expansion to occur. E.g.,
- * (gdb) run *
- * The "*" gets expanded by the shell into a list of files.
- * While this is a nice feature, it turns out to interact badly
- * with some of the catch-fork/catch-exec features we have added.
- * In particular, if the shell does any fork/exec's before
- * the exec of the target program, that can confuse GDB.
- * To disable this feature, set STARTUP_WITH_SHELL to 0.
- * To enable this feature, set STARTUP_WITH_SHELL to 1.
- * The catch-exec traps expected during start-up will 
- * be 1 if target is not started up with a shell, 2 if it is.
- * - RT
- */
+   will attempts to start up the debugee under a shell.
+   This is in order for argument-expansion to occur. E.g.,
+   (gdb) run *
+   The "*" gets expanded by the shell into a list of files.
+   While this is a nice feature, it turns out to interact badly
+   with some of the catch-fork/catch-exec features we have added.
+   In particular, if the shell does any fork/exec's before
+   the exec of the target program, that can confuse GDB.
+   To disable this feature, set STARTUP_WITH_SHELL to 0.
+   To enable this feature, set STARTUP_WITH_SHELL to 1.
+   The catch-exec traps expected during start-up will 
+   be 1 if target is not started up with a shell, 2 if it is.
+   - RT
+   If you disable this, you need to decrement
+   START_INFERIOR_TRAPS_EXPECTED in tm.h. */
 #define STARTUP_WITH_SHELL 1
-#define START_INFERIOR_TRAPS_EXPECTED (STARTUP_WITH_SHELL + 1)
 
 #endif /* !defined (INFERIOR_H) */