summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipsk
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-06-11 23:41:46 +0000
committerKarl Berry <karl@freefriends.org>2009-06-11 23:41:46 +0000
commit4d3dd9fc14c3ebb0b60193d8ce095d890d7631f1 (patch)
tree29ff9949a257e3f2d129e6e19fa8d92f7e493bbe /Build/source/texk/dvipsk
parent19f6c22e1b0882320d04bb9f2fb1f2b9422aeac5 (diff)
avoid painful getline collision, from Francois Charette, tlbuild mail
git-svn-id: svn://tug.org/texlive/trunk@13718 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipsk')
-rw-r--r--Build/source/texk/dvipsk/ChangeLog4
-rw-r--r--Build/source/texk/dvipsk/afm2tfm.c8
2 files changed, 8 insertions, 4 deletions
diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog
index 513eae694e3..0def02397a9 100644
--- a/Build/source/texk/dvipsk/ChangeLog
+++ b/Build/source/texk/dvipsk/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-12 Francois Charette <firmicus@ankabut.net>
+
+ * afm2tfm.c: rename getline to texlive_getline.
+
2009-06-01 Karl Berry <karl@tug.org>
* Update version numbers to 5.98.
diff --git a/Build/source/texk/dvipsk/afm2tfm.c b/Build/source/texk/dvipsk/afm2tfm.c
index d1f20c5b7a7..6fbb069f4b0 100644
--- a/Build/source/texk/dvipsk/afm2tfm.c
+++ b/Build/source/texk/dvipsk/afm2tfm.c
@@ -260,7 +260,7 @@ transform P2C(register int, x, register int, y)
}
int
-getline P1H(void) {
+texlive_getline P1H(void) {
register char *p ;
register int c ;
@@ -615,7 +615,7 @@ readadobe P1H(void) {
ai = newchar() ;
ai->adobenum = -1 ;
ai->adobename = "||" ; /* boundary character name */
- while (getline()) {
+ while (texlive_getline()) {
switch(interest(paramstring())) {
case FontName:
fontname = paramnewstring() ;
@@ -1891,7 +1891,7 @@ char *gettoken() {
while (1) {
while (param == 0 || *param == 0) {
- if (getline() == 0)
+ if (texlive_getline() == 0)
error("! premature end in encoding file") ;
for (p=buffer; *p; p++)
if (*p == '%') {
@@ -1982,7 +1982,7 @@ struct encoding *readencoding P1C(char *, enc)
p = gettoken() ;
if (strcmp(p, "]"))
error("! token 258 in encoding must be make-array (])") ;
- while (getline()) {
+ while (texlive_getline()) {
for (p=buffer; *p; p++)
if (*p == '%') {
if (ignoreligkern == 0)