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/dvi2tty/dvistuff.c | |
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/dvi2tty/dvistuff.c')
-rw-r--r-- | Build/source/texk/dvi2tty/dvistuff.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Build/source/texk/dvi2tty/dvistuff.c b/Build/source/texk/dvi2tty/dvistuff.c index 7ee7c37ac8c..764bf522978 100644 --- a/Build/source/texk/dvi2tty/dvistuff.c +++ b/Build/source/texk/dvi2tty/dvistuff.c @@ -123,7 +123,7 @@ void rule P3H(bool, long, long); void ruleaux P3H(long, long, char); long horizontalmove P1H(long); int skipnops P1H(void); -linetype * getline P1H(void); +linetype * texlive_getline P1H(void); linetype * findline P1H(void); unsigned long num P1H(int); long snum P1H(int); @@ -149,7 +149,7 @@ void rule (bool, long, long); void ruleaux (long, long, char); long horizontalmove (long); int skipnops (void); -linetype * getline (void); +linetype * texlive_getline (void); linetype * findline (void); unsigned long num (int); long snum (int); @@ -174,7 +174,7 @@ void rule (); void ruleaux (); long horizontalmove (); int skipnops (); -linetype * getline (); +linetype * texlive_getline (); linetype * findline (); unsigned long num (); long snum (); @@ -316,7 +316,7 @@ void initpage() h = 0L; v = 0L; /* initialize coordinates */ x = 0L; w = 0L; y = 0L; z = 0L; /* initialize amounts */ sptr = 0; /* initialize stack */ - currentline = getline(); /* initialize list of lines */ + currentline = texlive_getline(); /* initialize list of lines */ currentline->vv = 0L; firstline = currentline; lastline = currentline; @@ -671,7 +671,7 @@ int skipnops() /* skips by no-op commands */ /*----------------------------------------------------------------------------*/ -linetype *getline() /* returns an initialized line-object */ +linetype *texlive_getline() /* returns an initialized line-object */ { register int i; register linetype *temp; @@ -686,7 +686,7 @@ linetype *getline() /* returns an initialized line-object */ temp->text[i] = '\0'; return temp; -} /* getline */ +} /* texlive_getline */ /*----------------------------------------------------------------------------*/ @@ -697,7 +697,7 @@ linetype *findline() /* find best fit line were text should go */ if (v <= firstline->vv) { /* above first line */ if (firstline->vv - v > VERTICALEPSILON) { - temp = getline(); + temp = texlive_getline(); temp->next = firstline; firstline->prev = temp; temp->vv = v; @@ -708,7 +708,7 @@ linetype *findline() /* find best fit line were text should go */ if (v >= lastline->vv) { /* below last line */ if (v - lastline->vv > VERTICALEPSILON) { - temp = getline(); + temp = texlive_getline(); temp->prev = lastline; lastline->next = temp; temp->vv = v; @@ -732,7 +732,7 @@ linetype *findline() /* find best fit line were text should go */ } /* no line fits suitable, generate a new one */ - currentline = getline(); + currentline = texlive_getline(); currentline->next = temp->next; currentline->prev = temp; temp->next->prev = currentline; |