aboutsummaryrefslogtreecommitdiff
path: root/libiberty
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2009-06-16 12:43:58 +0000
committerNick Clifton <nickc@gcc.gnu.org>2009-06-16 12:43:58 +0000
commitee07afa0e1b9177b79a94ff57b1cf69b9f25e5fc (patch)
treeccd2ddf1c92bf7bb3d47fb7e3cba1b260f83d1ac /libiberty
parentde70bb20ba3864deca9c9cba9edf646ae1d8a226 (diff)
downloadgcc-ee07afa0e1b9177b79a94ff57b1cf69b9f25e5fc.zip
gcc-ee07afa0e1b9177b79a94ff57b1cf69b9f25e5fc.tar.gz
gcc-ee07afa0e1b9177b79a94ff57b1cf69b9f25e5fc.tar.bz2
re PR fortran/10197 (direct acces files not unformatted by default)
PR 10197 * testsuite/test-demangle.c: Rename getline to get_line to avoid conflicts with system function of the same name. From-SVN: r148526
Diffstat (limited to 'libiberty')
-rw-r--r--libiberty/ChangeLog6
-rw-r--r--libiberty/testsuite/test-demangle.c10
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