From: dtrg <none@none>
Date: Sun, 1 Aug 2010 10:34:27 +0000 (+0000)
Subject: Renamed getline() to getln() to avoid conflict with glibc's version.
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=74ac3f328f80bec4e11bfc60fe4ba86383d9d2ec;p=ack.git

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

diff --git a/util/ack/rmach.c b/util/ack/rmach.c
index 940da6d36..d1ce5d2f7 100644
--- 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 4e8cf519d..0b8f5e3a8 100644
--- 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);
 		}