Botch in previous change. Was comparing against "ask" instead of

follow_fork_mode_ask.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 747312dc1eda1d1b452402365462f39955946652..88189303c5021c88bb9571f89d7a5d78e6b6b31c 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun  8 11:41:41 2000  Andrew Cagney  <cagney@b1.cygnus.com>
+
+       * infrun.c (follow_inferior_fork): Bad merge from below.  Compare
+       strings using follow_fork_mode_ask and not "ask".
+
 Wed Jun  7 15:13:04 2000  Andrew Cagney  <cagney@b1.cygnus.com>
 
        * command.h (add_set_enum_cmd): Make ``enumlist'' and ``var''

diff --git a/gdb/infrun.c b/gdb/infrun.c
index 23877a4f025ac8e0420242a6ec3fa207e445c9fd..a945c1a40fe945e8c74a05c1cfb236b98585774d 100644 (file)
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -466,7 +466,7 @@ follow_inferior_fork (int parent_pid, int child_pid, int has_forked,
   const char *follow_mode = follow_fork_mode_string;
 
   /* Or, did the user not know, and want us to ask? */
-  if (follow_fork_mode_string == "ask")
+  if (follow_fork_mode_string == follow_fork_mode_ask)
     {
       internal_error ("follow_inferior_fork: \"ask\" mode not implemented");
       /* follow_mode = follow_fork_mode_...; */