Rename getline() to not conflict with the standard POSIX interface of the same name.

diff --git a/cde/config/makedepend/def.h b/cde/config/makedepend/def.h
index 85ef815acc7277ede6dd6aca4cc334b353ad94c3..16782226432e9d7df121374b4967c70656381e0b 100644 (file)
--- 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 631eded95a0950f23ee96be81e96dc28802656d6..ae67ecbdeae393991192bb21117dc4be1b56bc42 100644 (file)
--- 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 bad3fcf803c9352a07923ec499d148f047f7b72b..07153bee5419bcd127820adb539b790ea097c99b 100644 (file)
--- 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: