d0p1/ack
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
dtrg 2010-08-01 10:34:27 +00:00
parent 481bcd8a8b
commit 2c54f8c742
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
util/ack/rmach.c
View file

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

4
util/cmisc/tabgen.c
View file

@ -291,7 +291,7 @@ quoted(pstr)
} }
char * char *
getline(s, n, fp) getln(s, n, fp)
char *s; char *s;
FILE *fp; FILE *fp;
{ {
@ -326,7 +326,7 @@ DoFile(name)
fprintf(stderr, "%s: cannot read file %s\n", ProgCall, name); fprintf(stderr, "%s: cannot read file %s\n", ProgCall, name);
exit(1); exit(1);
} }
while (getline(text, BUFSIZE, fp) != NULL) { while (getln(text, BUFSIZE, fp) != NULL) {
if (text[0] == FILECOM) { if (text[0] == FILECOM) {
option(text); option(text);
} }