From 18dd384068910c496d03f67f7b81e8472ac897fb Mon Sep 17 00:00:00 2001 From: Pascal Stumpf Date: Thu, 9 Aug 2012 21:35:12 +0200 Subject: [PATCH] Rename getline() to not conflict with the standard POSIX interface of the same name. --- cde/config/makedepend/def.h | 2 +- cde/config/makedepend/main.c | 2 +- cde/config/makedepend/parse.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cde/config/makedepend/def.h b/cde/config/makedepend/def.h index 85ef815a..16782226 100644 --- a/cde/config/makedepend/def.h +++ b/cde/config/makedepend/def.h @@ -150,7 +150,7 @@ char *realloc(); char *copy(); char *base_name(); -char *getline(); +char *our_getline(); struct symtab **slookup(); struct symtab **isdefined(); struct symtab **fdefined(); diff --git a/cde/config/makedepend/main.c b/cde/config/makedepend/main.c index 631eded9..ae67ecbd 100644 --- a/cde/config/makedepend/main.c +++ b/cde/config/makedepend/main.c @@ -499,7 +499,7 @@ match(str, list) * Get the next line. We only return lines beginning with '#' since that * is all this program is ever interested in. */ -char *getline(filep) +char *our_getline(filep) register struct filepointer *filep; { register char *p, /* walking pointer */ diff --git a/cde/config/makedepend/parse.c b/cde/config/makedepend/parse.c index bad3fcf8..07153bee 100644 --- a/cde/config/makedepend/parse.c +++ b/cde/config/makedepend/parse.c @@ -56,7 +56,7 @@ gobble(filep, file, file_red) register char *line; register int type; - while (line = getline(filep)) { + while (line = our_getline(filep)) { switch(type = deftype(line, filep, file_red, file, FALSE)) { case IF: case IFFALSE: @@ -544,7 +544,7 @@ find_includes(filep, file, file_red, recursion, failOK) register int type; boolean recfailOK; - while (line = getline(filep)) { + while (line = our_getline(filep)) { switch(type = deftype(line, filep, file_red, file, TRUE)) { case IF: doif: -- 2.25.1