diff options
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 6 | ||||
| -rw-r--r-- | libiberty/testsuite/test-demangle.c | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 69d3617..f5ac783 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,9 @@ +2009-06-16 Nick Clifton <nickc@redhat.com> + + PR 10197 + * testsuite/test-demangle.c: Rename getline to get_line to avoid + conflicts with system function of the same name. + 2009-05-30 Eli Zaretskii <eliz@gnu.org> * snprintf.c: Doc fix. diff --git a/libiberty/testsuite/test-demangle.c b/libiberty/testsuite/test-demangle.c index 12b07dd..1c982d6 100644 --- a/libiberty/testsuite/test-demangle.c +++ b/libiberty/testsuite/test-demangle.c @@ -46,7 +46,7 @@ static unsigned int lineno; #define LINELEN 80 static void -getline(buf) +get_line(buf) struct line *buf; { char *data = buf->data; @@ -196,12 +196,12 @@ main(argc, argv) { const char *inp; - getline (&format); + get_line (&format); if (feof (stdin)) break; - getline (&input); - getline (&expect); + get_line (&input); + get_line (&expect); inp = protect_end (input.data); @@ -322,7 +322,7 @@ main(argc, argv) if (no_params) { - getline (&expect); + get_line (&expect); result = cplus_demangle (inp, DMGL_ANSI|DMGL_TYPES); if (result |