aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/infrun.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 747312d..8818930 100644
--- 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 23877a4..a945c1a 100644
--- 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_...; */