--- tetex-src-3.0/texk/dvipsk/afm2tfm.c.org	2005-01-30 06:17:09.000000000 -0700
+++ tetex-src-3.0/texk/dvipsk/afm2tfm.c	2009-07-24 23:00:13.177637867 -0600
@@ -257,7 +257,7 @@
 }
 
 int
-getline P1H(void) {
+_getline P1H(void) {
    register char *p ;
    register int c ;
 
@@ -606,7 +606,7 @@
    ai = newchar() ;
    ai->adobenum = -1 ;
    ai->adobename = "||" ; /* boundary character name */
-   while (getline()) {
+   while (_getline()) {
       switch(interest(paramstring())) {
 case FontName:
          fontname = paramnewstring() ;
@@ -1882,7 +1882,7 @@
 
    while (1) {
       while (param == 0 || *param == 0) {
-         if (getline() == 0)
+         if (_getline() == 0)
             error("! premature end in encoding file") ;
          for (p=buffer; *p; p++)
             if (*p == '%') {
@@ -1973,7 +1973,7 @@
       p = gettoken() ;
       if (strcmp(p, "]"))
          error("! token 258 in encoding must be make-array (])") ;
-      while (getline()) {
+      while (_getline()) {
          for (p=buffer; *p; p++)
             if (*p == '%') {
                if (ignoreligkern == 0)
--- tetex-src-3.0/texk/web2c/cpascal.h.org	2004-08-28 14:49:59.000000000 -0600
+++ tetex-src-3.0/texk/web2c/cpascal.h	2009-07-25 04:04:09.829632590 -0600
@@ -15,6 +15,10 @@
 /* We must include this first, to resolve many C issues.  */
 #include "config.h"
 
+#ifdef __GNUC__
+#define getline _getline /* avoid clash with getline()  declared in stdio.h */
+#endif
+
 /* We only use getopt in the applications, not in web2c itself.  */
 #include <kpathsea/getopt.h>
 
--- tetex-src-3.0/texk/web2c/mpware/mpto.c.org	2004-07-14 11:40:35.000000000 -0600
+++ tetex-src-3.0/texk/web2c/mpware/mpto.c	2009-07-24 23:04:02.381606692 -0600
@@ -95,7 +95,7 @@
 	exit(1);
 }
 
-char *getline()	/* returns NULL on EOF or error, otherwise buf */
+char *_getline()	/* returns NULL on EOF or error, otherwise buf */
 {
 	int c;
 	unsigned loc = 0;
@@ -203,10 +203,10 @@
 
 	while (*aa==' ' || *aa=='\t') aa++;
 	if (*aa==0)
-		if ((aa=getline())==NULL)
+		if ((aa=_getline())==NULL)
 			err("btex section does not end");
 	do {	if (*aa==0)
-			if ((aa=getline())==NULL)
+			if ((aa=_getline())==NULL)
 				err("btex section does not end");
 			else printf("\n");
 		if (getbta(aa) && *tt=='e') {
@@ -372,7 +372,7 @@
           postverb = troff_postverb;
 	}
 	printf("%s",predoc);
-	while (getline()!=NULL)
+	while (_getline()!=NULL)
 		do_line();
 	printf("%s",postdoc);
         free(buf);