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/ttf2pk | |
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/ttf2pk')
-rw-r--r-- | Build/source/texk/ttf2pk/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/ttf2pk/newobj.c | 4 | ||||
-rw-r--r-- | Build/source/texk/ttf2pk/newobj.h | 2 | ||||
-rw-r--r-- | Build/source/texk/ttf2pk/parse.c | 6 |
4 files changed, 10 insertions, 6 deletions
diff --git a/Build/source/texk/ttf2pk/ChangeLog b/Build/source/texk/ttf2pk/ChangeLog index b8805da4cad..bec59435f63 100644 --- a/Build/source/texk/ttf2pk/ChangeLog +++ b/Build/source/texk/ttf2pk/ChangeLog @@ -1,3 +1,7 @@ +2009-06-12 Francois Charette <firmicus@ankabut.net> + + * newobj.c, newobj.h, parse.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/ttf2pk/newobj.c b/Build/source/texk/ttf2pk/newobj.c index 65ae9f69f0b..1a87f919283 100644 --- a/Build/source/texk/ttf2pk/newobj.c +++ b/Build/source/texk/ttf2pk/newobj.c @@ -128,13 +128,13 @@ get_line(FILE *f) /* - * getline() is a wrapper function for get_line(). It returns `False' in + * texlive_getline() is a wrapper function for get_line(). It returns `False' in * case of error and expects a pointer to a buffer to store the current * line. Additionally, the final newline character is stripped. */ Boolean -getline(char **bufferp, FILE *f) +texlive_getline(char **bufferp, FILE *f) { size_t l; diff --git a/Build/source/texk/ttf2pk/newobj.h b/Build/source/texk/ttf2pk/newobj.h index 233c4ea4b16..f7c474dfa58 100644 --- a/Build/source/texk/ttf2pk/newobj.h +++ b/Build/source/texk/ttf2pk/newobj.h @@ -26,7 +26,7 @@ void *mycalloc(size_t len); void *myrealloc(void *oldp, size_t len); char *get_line(FILE *f); -Boolean getline(char **bufferp, FILE *f); +Boolean texlive_getline(char **bufferp, FILE *f); char *newstring(char *s); ttfinfo *newchar(Font *fnt); diff --git a/Build/source/texk/ttf2pk/parse.c b/Build/source/texk/ttf2pk/parse.c index 18a64cada78..3c5b2885ecc 100644 --- a/Build/source/texk/ttf2pk/parse.c +++ b/Build/source/texk/ttf2pk/parse.c @@ -63,7 +63,7 @@ gettoken(char **bufferp, size_t *offsetp, FILE *f, Font *fnt, if (*bufferp) free(*bufferp); - if (getline(bufferp, f) == False) + if (texlive_getline(bufferp, f) == False) oops("Premature end in encoding file."); curp = *bufferp; @@ -187,7 +187,7 @@ readencoding(char **enc, Font *fnt, Boolean ignoreligkern) "Token 258 in encoding must be make-array (])."); free(p); - while (getline(&buffer, enc_file)) + while (texlive_getline(&buffer, enc_file)) { for (p = buffer; *p; p++) if (*p == '%') @@ -246,7 +246,7 @@ get_replacements(Font *fnt) if (replacement_file == NULL) oops("Cannot open replacement file `%s'.", real_replacement_name); - while (getline(&buffer, replacement_file)) + while (texlive_getline(&buffer, replacement_file)) { for (p = buffer; *p; p++) if (*p == '%') |