Renamed getline() to getln() to avoid conflict with glibc's version.

diff --git a/util/ack/rmach.c b/util/ack/rmach.c
index 940da6d..d1ce5d2 100644 (file)
--- a/util/ack/rmach.c
+++ b/util/ack/rmach.c
@@ -49,7 +49,7 @@ static char rcs_dmach[] = RCS_DMACH ;
 extern growstring scanb();
 extern growstring scanvars();
 
-int getline() ;
+int getln() ;
 int getinchar() ;
 static char *ty_name ;
 static char *bol ;
@@ -65,7 +65,7 @@ setlist(name) char *name ; {
 
        inname=name ;
        open_in(name) ;
-       while ( getline() ) {
+       while ( getln() ) {
                if ( strcmp(VAR,ty_name)==0 ) {
                        doassign(bol,(char *)0,0) ;
                } else
@@ -114,7 +114,7 @@ intrf() {
        new= (trf *)getcore(sizeof *new) ;
        new->t_name= keeps(bol) ;
        for (;;) {
-               if ( !getline() ) {
+               if ( !getln() ) {
                        fuerror("unexpected EOF on %s",inname) ;
                }
                twice= NO ;
@@ -366,7 +366,7 @@ int getinchar() {
        return token ;
 }
 
-int getline() {
+int getln() {
        register char *c_ptr ;
 
        do {

diff --git a/util/cmisc/tabgen.c b/util/cmisc/tabgen.c
index 777bda8..4cbcf8b 100644 (file)
--- a/util/cmisc/tabgen.c
+++ b/util/cmisc/tabgen.c
@@ -291,7 +291,7 @@ quoted(pstr)
 }
 
 char *
-getline(s, n, fp)
+getln(s, n, fp)
        char *s;
        FILE *fp;
 {
@@ -326,7 +326,7 @@ DoFile(name)
                fprintf(stderr, "%s: cannot read file %s\n", ProgCall, name);
                exit(1);
        }
-       while (getline(text, BUFSIZE, fp) != NULL) {
+       while (getln(text, BUFSIZE, fp) != NULL) {
                if (text[0] == FILECOM) {
                        option(text);
                }