--- src/fields.c.orig 2001-09-11 14:57:08.000000000 +1000 +++ src/fields.c 2012-05-04 10:24:17.000000000 +1000 @@ -110,16 +110,16 @@ void dispfield(p)register const struct f /* try and append one valid field to rdheader from stdin */ int readhead P((void)) { int idlen; - getline(); + procmail_getline(); if((idlen=breakfield(buf,buffilled))<=0) /* not the start of a valid field */ return 0; if(idlen==STRLEN(FROM)&&eqFrom_(buf)) /* it's a From_ line */ { if(rdheader) return 0; /* the From_ line was a fake! */ - for(;buflast=='>';getline()); /* gather continued >From_ lines */ + for(;buflast=='>';procmail_getline()); /* gather continued >From_ lines */ } else - for(;;getline()) /* get the rest of the continued field */ + for(;;procmail_getline()) /* get the rest of the continued field */ { switch(buflast) /* will this line be continued? */ { case ' ':case '\t': /* yep, it sure is */ continue; --- src/formail.c.orig 2001-09-11 14:57:32.000000000 +1000 +++ src/formail.c 2012-05-04 10:24:35.000000000 +1000 @@ -819,7 +819,7 @@ splitit: { if(!lnl) /* did the p { if(split) /* gobble up the next start separator */ { buffilled=0; #ifdef sMAILBOX_SEPARATOR - getline();buffilled=0; /* but only if it's defined */ + procmail_getline();buffilled=0; /* but only if it's defined */ #endif if(buflast!=EOF) /* if any */ goto splitit; --- src/formisc.c.orig 2001-06-29 12:20:45.000000000 +1000 +++ src/formisc.c 2012-05-04 10:24:55.000000000 +1000 @@ -115,7 +115,7 @@ void loadchar(c)const int c; /* a buf[buffilled++]=c; } -int getline P((void)) /* read a newline-terminated line */ +int procmail_getline P((void)) /* read a newline-terminated line */ { if(buflast==EOF) /* at the end of our Latin already? */ { loadchar('\n'); /* fake empty line */ return EOF; /* spread the word */ --- src/formisc.h.orig 1999-04-19 16:42:15.000000000 +1000 +++ src/formisc.h 2012-05-04 10:27:11.000000000 +1000 @@ -17,4 +17,4 @@ void char* skipwords P((char*start)); int - getline P((void)); + procmail_getline P((void));