summaryrefslogtreecommitdiff
path: root/Build/source/utils/t1utils
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/utils/t1utils
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/utils/t1utils')
-rw-r--r--Build/source/utils/t1utils/ChangeLog4
-rw-r--r--Build/source/utils/t1utils/t1asm.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/Build/source/utils/t1utils/ChangeLog b/Build/source/utils/t1utils/ChangeLog
index 9cc14b044f6..af2984d1f02 100644
--- a/Build/source/utils/t1utils/ChangeLog
+++ b/Build/source/utils/t1utils/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-12 Francois Charette <firmicus@ankabut.net>
+
+ * t1asm.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/utils/t1utils/t1asm.c b/Build/source/utils/t1utils/t1asm.c
index e3758591f69..17d991277fa 100644
--- a/Build/source/utils/t1utils/t1asm.c
+++ b/Build/source/utils/t1utils/t1asm.c
@@ -280,7 +280,7 @@ static int check_line_charstring()
the newline is put into line[]. When terminated by '{', the '{' is not put
into line[], and the flag start_charstring is set to 1. */
-static void getline()
+static void texlive_getline()
{
int c;
char *p = line;
@@ -721,7 +721,7 @@ particular purpose.\n");
without /Subrs sections and provided a patch. */
while (!feof(ifp) && !ferror(ifp)) {
- getline();
+ texlive_getline();
if (!ever_active) {
if (strncmp(line, "currentfile eexec", 17) == 0 && isspace(line[17])) {
@@ -792,7 +792,7 @@ particular purpose.\n");
/* There may be additional code. */
while (!feof(ifp) && !ferror(ifp)) {
- getline();
+ texlive_getline();
eexec_string(line);
}