diff options
author | Karl Berry <karl@freefriends.org> | 2009-06-11 23:41:46 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-06-11 23:41:46 +0000 |
commit | 4d3dd9fc14c3ebb0b60193d8ce095d890d7631f1 (patch) | |
tree | 29ff9949a257e3f2d129e6e19fa8d92f7e493bbe /Build/source/texk/afm2pl | |
parent | 19f6c22e1b0882320d04bb9f2fb1f2b9422aeac5 (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/afm2pl')
-rw-r--r-- | Build/source/texk/afm2pl/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/afm2pl/afm2pl.c | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/Build/source/texk/afm2pl/ChangeLog b/Build/source/texk/afm2pl/ChangeLog index 107b3246fa8..6ebadcf7664 100644 --- a/Build/source/texk/afm2pl/ChangeLog +++ b/Build/source/texk/afm2pl/ChangeLog @@ -1,3 +1,7 @@ +2009-06-12 Francois Charette <firmicus@ankabut.net> + + * afm2pl.c: rename getline to texlive_getline. + 2009-05-07 Peter Breitenlohner <peb@mppmu.mpg.de> Adapt to TL2009 build system. diff --git a/Build/source/texk/afm2pl/afm2pl.c b/Build/source/texk/afm2pl/afm2pl.c index 0b7723f75f0..313f8b70147 100644 --- a/Build/source/texk/afm2pl/afm2pl.c +++ b/Build/source/texk/afm2pl/afm2pl.c @@ -345,7 +345,7 @@ P2C (register int, x, register int, y) /* read a line from infile into buffer and obuffer */ int - get_line + texlive_getline P1H (void) { register char *p; @@ -781,7 +781,7 @@ P1H (void) afmencoding->vec[i] = ".notdef"; afmencoding->name = "Unspecified"; - while (get_line ()) { + while (texlive_getline ()) { switch (interest (paramstring ())) { case FontName: fontname = paramnewstring (); @@ -963,7 +963,7 @@ gettoken () while (1) { while (param == 0 || *param == 0) { - if (get_line () == 0) + if (texlive_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 (get_line ()) { + while (texlive_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 (get_line ()) + while (texlive_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 (get_line ()) + while (texlive_getline ()) checkligkern (buffer, 0); /* 2nd param 0: lig file */ fclose (infile); } |