From 4d3dd9fc14c3ebb0b60193d8ce095d890d7631f1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 11 Jun 2009 23:41:46 +0000 Subject: avoid painful getline collision, from Francois Charette, tlbuild mail git-svn-id: svn://tug.org/texlive/trunk@13718 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/utils/t1utils/ChangeLog | 4 ++++ Build/source/utils/t1utils/t1asm.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'Build/source/utils') 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 + + * t1asm.c: rename getline to texlive_getline. + 2009-05-07 Peter Breitenlohner 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); } -- cgit v1.2.3