diff -Naur texk/dvipsk/afm2tfm.c texk/dvipsk/afm2tfm.c --- texk/dvipsk/afm2tfm.c 2009-07-21 05:59:32.635014710 -0700 +++ texk/dvipsk/afm2tfm.c 2009-07-21 13:37:27.978595399 -0700 @@ -257,7 +257,7 @@ } int -getline P1H(void) { +tetex_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 (tetex_getline()) { switch(interest(paramstring())) { case FontName: fontname = paramnewstring() ; @@ -1882,7 +1882,7 @@ while (1) { while (param == 0 || *param == 0) { - if (getline() == 0) + if (tetex_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 (tetex_getline()) { for (p=buffer; *p; p++) if (*p == '%') { if (ignoreligkern == 0) diff -Naur texk/web2c/cpascal.h texk/web2c/cpascal.h --- texk/web2c/cpascal.h 2009-07-21 05:59:32.663015345 -0700 +++ texk/web2c/cpascal.h 2009-07-21 13:28:29.754590069 -0700 @@ -241,6 +241,16 @@ #define getname vms_getname #endif + +/* Apparently POSIX 2008 has getline and glibc 2.9.90 exports it. + * tangle, weave, et al. use that symbol; try to define it away so + * something that a standard won't usurp. + * From http://tutimura.ath.cx/ptetex/?%C6%B0%BA%EE%CA%F3%B9%F0%2F134 */ +#ifdef getline +#undef getline +#endif +#define getline web2c_getline + /* Declarations for the routines we provide ourselves in lib/. */ extern string basenamechangesuffix P3H(const_string,const_string,const_string);