diff -p -up source/texk/afm2pl/afm2pl.c.getline source/texk/afm2pl/afm2pl.c
--- source/texk/afm2pl/afm2pl.c.getline	2006-01-17 19:41:51.000000000 -0200
+++ source/texk/afm2pl/afm2pl.c	2009-07-16 11:24:09.000000000 -0300
@@ -345,7 +345,7 @@ P2C (register int, x, register int, y)
 
 /* read a line from infile into buffer and obuffer */
 int
-  getline
+  _getline
 P1H (void)
 {
   register char *p;
@@ -781,7 +781,7 @@ P1H (void)
     afmencoding->vec[i] = ".notdef";
   afmencoding->name = "Unspecified";
 
-  while (getline ()) {
+  while (_getline ()) {
     switch (interest (paramstring ())) {
     case FontName:
       fontname = paramnewstring ();
@@ -963,7 +963,7 @@ gettoken ()
 
   while (1) {
     while (param == 0 || *param == 0) {
-      if (getline () == 0)
+      if (_getline () == 0)
         error ("! premature end in encoding file");
     }
     if (param[0] == '%') {
@@ -1540,7 +1540,7 @@ extraligkerninfo ()
     encfilename =
       openin (encfilename, kpse_enc_format, ".enc");
     for (lig_it = 0; lig_it < 2; lig_it++) {
-      while (getline ()) {
+      while (_getline ()) {
         /* search for (ligkern) comment in line */
         for (p = buffer; *p; p++)
           if (*p == '%') {
@@ -1576,7 +1576,7 @@ extraligkerninfo ()
     for (i = 0; i < ligfilenames->n; i++) {
       ligfilename = openin (ligfilenames->names[i],
                             kpse_lig_format, ".lig");
-      while (getline ())
+      while (_getline ())
         checkligkern (buffer, 0);       /* 2nd param 0: lig file */
       fclose (infile);
     }
@@ -1607,7 +1607,7 @@ extraligkerninfo ()
   for (i = 0; i < Ligfilenames->n; i++) {
     ligfilename = openin (Ligfilenames->names[i],
                           kpse_lig_format, ".lig");
-    while (getline ())
+    while (_getline ())
       checkligkern (buffer, 0);       /* 2nd param 0: lig file */
     fclose (infile);
   }
diff -p -up source/texk/dvi2tty/dvistuff.c.getline source/texk/dvi2tty/dvistuff.c
--- source/texk/dvi2tty/dvistuff.c.getline	2006-01-17 19:41:51.000000000 -0200
+++ source/texk/dvi2tty/dvistuff.c	2009-07-16 11:24:09.000000000 -0300
@@ -123,7 +123,7 @@ void            rule            P3H(bool
 void            ruleaux         P3H(long, long, char);
 long            horizontalmove  P1H(long);
 int             skipnops        P1H(void);
-linetype    *   getline         P1H(void);
+linetype    *   _getline         P1H(void);
 linetype    *   findline        P1H(void);
 unsigned long   num             P1H(int);
 long            snum            P1H(int);
@@ -149,7 +149,7 @@ void            rule            (bool, l
 void            ruleaux         (long, long, char);
 long            horizontalmove  (long);
 int             skipnops        (void);
-linetype    *   getline         (void);
+linetype    *   _getline         (void);
 linetype    *   findline        (void);
 unsigned long   num             (int);
 long            snum            (int);
@@ -174,7 +174,7 @@ void            rule            ();
 void            ruleaux         ();
 long            horizontalmove  ();
 int             skipnops        ();
-linetype    *   getline         ();
+linetype    *   _getline         ();
 linetype    *   findline        ();
 unsigned long   num             ();
 long            snum            ();
@@ -316,7 +316,7 @@ void initpage()
     h = 0L;  v = 0L;                        /* initialize coordinates   */
     x = 0L;  w = 0L;  y = 0L;  z = 0L;      /* initialize amounts       */
     sptr = 0;                               /* initialize stack         */
-    currentline = getline();                /* initialize list of lines */
+    currentline = _getline();                /* initialize list of lines */
     currentline->vv = 0L;
     firstline   = currentline;
     lastline    = currentline;
@@ -671,7 +671,7 @@ int skipnops()                      /* s
 
 /*----------------------------------------------------------------------------*/
 
-linetype *getline()             /* returns an initialized line-object */
+linetype *_getline()             /* returns an initialized line-object */
 {
     register int  i;
     register linetype *temp;
@@ -686,7 +686,7 @@ linetype *getline()             /* retur
     temp->text[i] = '\0';
     return temp;
 
-} /* getline */
+} /* _getline */
 
 /*----------------------------------------------------------------------------*/
 
@@ -697,7 +697,7 @@ linetype *findline()            /* find 
 
     if (v <= firstline->vv) {                      /* above first line */
         if (firstline->vv - v > VERTICALEPSILON) {
-            temp = getline();
+            temp = _getline();
             temp->next = firstline;
             firstline->prev = temp;
             temp->vv = v;
@@ -708,7 +708,7 @@ linetype *findline()            /* find 
 
     if (v >= lastline->vv) {                       /* below last line */
         if (v - lastline->vv > VERTICALEPSILON) {
-            temp = getline();
+            temp = _getline();
             temp->prev = lastline;
             lastline->next = temp;
             temp->vv = v;
@@ -732,7 +732,7 @@ linetype *findline()            /* find 
     }
 
     /* no line fits suitable, generate a new one */
-    currentline = getline();
+    currentline = _getline();
     currentline->next = temp->next;
     currentline->prev = temp;
     temp->next->prev = currentline;
diff -p -up source/texk/dvipsk/afm2tfm.c.getline source/texk/dvipsk/afm2tfm.c
--- source/texk/dvipsk/afm2tfm.c.getline	2007-05-06 15:10:53.000000000 -0300
+++ source/texk/dvipsk/afm2tfm.c	2009-07-16 11:24:09.000000000 -0300
@@ -257,7 +257,7 @@ transform P2C(register int, x, register 
 }
 
 int
-getline P1H(void) {
+_getline P1H(void) {
    register char *p ;
    register int c ;
 
@@ -612,7 +612,7 @@ readadobe P1H(void) {
    ai = newchar() ;
    ai->adobenum = -1 ;
    ai->adobename = "||" ; /* boundary character name */
-   while (getline()) {
+   while (_getline()) {
       switch(interest(paramstring())) {
 case FontName:
          fontname = paramnewstring() ;
@@ -1888,7 +1888,7 @@ char *gettoken() {
 
    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 == '%') {
@@ -1979,7 +1979,7 @@ struct encoding *readencoding P1C(char *
       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)
diff -p -up source/texk/ttf2pk/case.c.getline source/texk/ttf2pk/case.c
diff -p -up source/texk/ttf2pk/case.h.getline source/texk/ttf2pk/case.h
diff -p -up source/texk/ttf2pk/c-auto.h.getline source/texk/ttf2pk/c-auto.h
diff -p -up source/texk/ttf2pk/dvidrv.doc.getline source/texk/ttf2pk/dvidrv.doc
diff -p -up source/texk/ttf2pk/emdir.c.getline source/texk/ttf2pk/emdir.c
diff -p -up source/texk/ttf2pk/emdir.h.getline source/texk/ttf2pk/emdir.h
diff -p -up source/texk/ttf2pk/emtexdir.c.getline source/texk/ttf2pk/emtexdir.c
diff -p -up source/texk/ttf2pk/emtexdir.h.getline source/texk/ttf2pk/emtexdir.h
diff -p -up source/texk/ttf2pk/errormsg.c.getline source/texk/ttf2pk/errormsg.c
diff -p -up source/texk/ttf2pk/errormsg.h.getline source/texk/ttf2pk/errormsg.h
diff -p -up source/texk/ttf2pk/filesrch.c.getline source/texk/ttf2pk/filesrch.c
diff -p -up source/texk/ttf2pk/filesrch.h.getline source/texk/ttf2pk/filesrch.h
diff -p -up source/texk/ttf2pk/ligkern.c.getline source/texk/ttf2pk/ligkern.c
diff -p -up source/texk/ttf2pk/ligkern.h.getline source/texk/ttf2pk/ligkern.h
diff -p -up source/texk/ttf2pk/newobj.c.getline source/texk/ttf2pk/newobj.c
--- source/texk/ttf2pk/newobj.c.getline	2006-01-17 19:41:51.000000000 -0200
+++ source/texk/ttf2pk/newobj.c	2009-07-16 11:37:56.000000000 -0300
@@ -128,13 +128,13 @@ get_line(FILE *f)
 
 
 /*
- *   getline() is a wrapper function for get_line().  It returns `False' in
+ *   _getline() is a wrapper function for get_line().  It returns `False' in
  *   case of error and expects a pointer to a buffer to store the current
  *   line.   Additionally, the final newline character is stripped.
  */
 
 Boolean
-getline(char **bufferp, FILE *f)
+_getline(char **bufferp, FILE *f)
 {
   size_t l;
 
diff -p -up source/texk/ttf2pk/newobj.h.getline source/texk/ttf2pk/newobj.h
--- source/texk/ttf2pk/newobj.h.getline	2006-01-17 19:41:51.000000000 -0200
+++ source/texk/ttf2pk/newobj.h	2009-07-16 11:38:20.000000000 -0300
@@ -26,7 +26,7 @@ void *mycalloc(size_t len);
 void *myrealloc(void *oldp, size_t len);
 
 char *get_line(FILE *f);
-Boolean getline(char **bufferp, FILE *f);
+Boolean _getline(char **bufferp, FILE *f);
 char *newstring(char *s);
 
 ttfinfo *newchar(Font *fnt);
diff -p -up source/texk/ttf2pk/parse.c.getline source/texk/ttf2pk/parse.c
--- source/texk/ttf2pk/parse.c.getline	2006-01-17 19:41:51.000000000 -0200
+++ source/texk/ttf2pk/parse.c	2009-07-16 11:37:56.000000000 -0300
@@ -63,7 +63,7 @@ gettoken(char **bufferp, size_t *offsetp
       if (*bufferp)
         free(*bufferp);
 
-      if (getline(bufferp, f) == False)
+      if (_getline(bufferp, f) == False)
         oops("Premature end in encoding file.");
 
       curp = *bufferp;
@@ -187,7 +187,7 @@ readencoding(char **enc, Font *fnt, Bool
         "Token 258 in encoding must be make-array (]).");
     free(p);
 
-    while (getline(&buffer, enc_file))
+    while (_getline(&buffer, enc_file))
     {
       for (p = buffer; *p; p++)
         if (*p == '%')
@@ -246,7 +246,7 @@ get_replacements(Font *fnt)
   if (replacement_file == NULL)
     oops("Cannot open replacement file `%s'.", real_replacement_name);
 
-  while (getline(&buffer, replacement_file))
+  while (_getline(&buffer, replacement_file))
   {
     for (p = buffer; *p; p++)
       if (*p == '%')
diff -p -up source/texk/ttf2pk/parse.h.getline source/texk/ttf2pk/parse.h
diff -p -up source/texk/ttf2pk/pklib.c.getline source/texk/ttf2pk/pklib.c
diff -p -up source/texk/ttf2pk/pklib.h.getline source/texk/ttf2pk/pklib.h
diff -p -up source/texk/ttf2pk/subfont.c.getline source/texk/ttf2pk/subfont.c
diff -p -up source/texk/ttf2pk/subfont.h.getline source/texk/ttf2pk/subfont.h
diff -p -up source/texk/ttf2pk/texenc.c.getline source/texk/ttf2pk/texenc.c
diff -p -up source/texk/ttf2pk/texenc.h.getline source/texk/ttf2pk/texenc.h
diff -p -up source/texk/ttf2pk/tfmaux.c.getline source/texk/ttf2pk/tfmaux.c
diff -p -up source/texk/ttf2pk/tfmaux.h.getline source/texk/ttf2pk/tfmaux.h
diff -p -up source/texk/ttf2pk/ttf2pk.c.getline source/texk/ttf2pk/ttf2pk.c
diff -p -up source/texk/ttf2pk/ttf2pk.doc.getline source/texk/ttf2pk/ttf2pk.doc
diff -p -up source/texk/ttf2pk/ttf2tfm.c.getline source/texk/ttf2pk/ttf2tfm.c
diff -p -up source/texk/ttf2pk/ttf2tfm.h.getline source/texk/ttf2pk/ttf2tfm.h
diff -p -up source/texk/ttf2pk/ttfaux.c.getline source/texk/ttf2pk/ttfaux.c
diff -p -up source/texk/ttf2pk/ttfaux.h.getline source/texk/ttf2pk/ttfaux.h
diff -p -up source/texk/ttf2pk/ttfenc.c.getline source/texk/ttf2pk/ttfenc.c
diff -p -up source/texk/ttf2pk/ttfenc.h.getline source/texk/ttf2pk/ttfenc.h
diff -p -up source/texk/ttf2pk/ttflib.c.getline source/texk/ttf2pk/ttflib.c
diff -p -up source/texk/ttf2pk/ttflib.h.getline source/texk/ttf2pk/ttflib.h
diff -p -up source/texk/ttf2pk/vplaux.c.getline source/texk/ttf2pk/vplaux.c
diff -p -up source/texk/ttf2pk/vplaux.h.getline source/texk/ttf2pk/vplaux.h
diff -p -up source/texk/web2c/cpascal.h.getline source/texk/web2c/cpascal.h
--- source/texk/web2c/cpascal.h.getline	2007-10-01 12:48:27.000000000 -0300
+++ source/texk/web2c/cpascal.h	2009-07-16 11:24:09.000000000 -0300
@@ -14,6 +14,7 @@
 
 /* We must include this first, to resolve many C issues.  */
 #include "config.h"
+#define getline _getline
 
 /* We only use getopt in the applications, not in web2c itself.  */
 #include <kpathsea/getopt.h>
diff -p -up source/texk/web2c/mpware/mpto.c.getline source/texk/web2c/mpware/mpto.c
--- source/texk/web2c/mpware/mpto.c.getline	2007-11-28 20:38:47.000000000 -0200
+++ source/texk/web2c/mpware/mpto.c	2009-07-16 11:24:09.000000000 -0300
@@ -97,7 +97,7 @@ usage(char *progn)
 }
 
 char *
-getline(void)
+_getline(void)
 {				/* returns NULL on EOF or error, otherwise buf */
     int c;
     unsigned loc = 0;
@@ -301,7 +301,7 @@ copytex(void)
     char *res = NULL;
     do {
 	if (*aa == 0)
-	  if ((aa = getline()) == NULL)
+	  if ((aa = _getline()) == NULL)
 	    err("btex section does not end");
 
 	if (getbta(aa) && *tt == 'e') {
@@ -476,7 +476,7 @@ Current maintainer: Taco Hoekwater.\n");
 	postverb = troff_postverb;
     }
     printf("%s", predoc);
-    while (getline() != NULL)
+    while (_getline() != NULL)
 	do_line();
     printf("%s", postdoc);
     exit(0);