diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/event-top.c | 4 | ||||
| -rw-r--r-- | gdb/top.c | 4 |
3 files changed, 5 insertions, 9 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 525f6bf..6da59cd 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2004-10-14 Mark Kettenis <kettenis@gnu.org> + + * top.c (gdb_readline): Always accept "\r\n" as a line-ending. + * event-top.c (gdb_readline2): Likewise. + 2004-10-14 Orjan Friberg <orjanf@axis.com> * cris-tdep.c (_initialize_cris_tdep): Re-add call to @@ -298,7 +303,6 @@ * mips-tdep.c (mips32_next_pc): Check the register's contents, not its number for BLEZ/BLEZL and BGTZ/BGTZL. ->>>>>>> 1.6475 2004-10-07 Kei Sakamoto <sakamoto.kei@renesas.com> * m32r-tdep.c (decode_prologue): Support functions written diff --git a/gdb/event-top.c b/gdb/event-top.c index 01f1f51..39d52fe 100644 --- a/gdb/event-top.c +++ b/gdb/event-top.c @@ -855,15 +855,11 @@ gdb_readline2 (gdb_client_data client_data) } if (c == '\n') -#ifndef CRLF_SOURCE_FILES - break; -#else { if (input_index > 0 && result[input_index - 1] == '\r') input_index--; break; } -#endif result[input_index++] = c; while (input_index >= result_size) @@ -932,15 +932,11 @@ gdb_readline (char *prompt_arg) } if (c == '\n') -#ifndef CRLF_SOURCE_FILES - break; -#else { if (input_index > 0 && result[input_index - 1] == '\r') input_index--; break; } -#endif result[input_index++] = c; while (input_index >= result_size) |