]>
Commit | Line | Data |
---|---|---|
d091e960 ZU |
1 | --- texlive-20080816-source.orig/texk/afm2pl/afm2pl.c 2009-07-04 10:12:19.883158871 +0200 |
2 | +++ texlive-20080816-source/texk/afm2pl/afm2pl.c 2009-07-04 10:58:24.613569483 +0200 | |
3 | @@ -345,7 +345,7 @@ | |
4 | ||
5 | /* read a line from infile into buffer and obuffer */ | |
6 | int | |
7 | - getline | |
8 | + tl_getline | |
9 | P1H (void) | |
10 | { | |
11 | register char *p; | |
12 | @@ -781,7 +781,7 @@ | |
13 | afmencoding->vec[i] = ".notdef"; | |
14 | afmencoding->name = "Unspecified"; | |
15 | ||
16 | - while (getline ()) { | |
17 | + while (tl_getline ()) { | |
18 | switch (interest (paramstring ())) { | |
19 | case FontName: | |
20 | fontname = paramnewstring (); | |
21 | @@ -963,7 +963,7 @@ | |
22 | ||
23 | while (1) { | |
24 | while (param == 0 || *param == 0) { | |
25 | - if (getline () == 0) | |
26 | + if (tl_getline () == 0) | |
27 | error ("! premature end in encoding file"); | |
28 | } | |
29 | if (param[0] == '%') { | |
30 | @@ -1540,7 +1540,7 @@ | |
31 | encfilename = | |
32 | openin (encfilename, kpse_enc_format, ".enc"); | |
33 | for (lig_it = 0; lig_it < 2; lig_it++) { | |
34 | - while (getline ()) { | |
35 | + while (tl_getline ()) { | |
36 | /* search for (ligkern) comment in line */ | |
37 | for (p = buffer; *p; p++) | |
38 | if (*p == '%') { | |
39 | @@ -1576,7 +1576,7 @@ | |
40 | for (i = 0; i < ligfilenames->n; i++) { | |
41 | ligfilename = openin (ligfilenames->names[i], | |
42 | kpse_lig_format, ".lig"); | |
43 | - while (getline ()) | |
44 | + while (tl_getline ()) | |
45 | checkligkern (buffer, 0); /* 2nd param 0: lig file */ | |
46 | fclose (infile); | |
47 | } | |
48 | @@ -1607,7 +1607,7 @@ | |
49 | for (i = 0; i < Ligfilenames->n; i++) { | |
50 | ligfilename = openin (Ligfilenames->names[i], | |
51 | kpse_lig_format, ".lig"); | |
52 | - while (getline ()) | |
53 | + while (tl_getline ()) | |
54 | checkligkern (buffer, 0); /* 2nd param 0: lig file */ | |
55 | fclose (infile); | |
56 | } | |
57 | --- texlive-20080816-source.orig/texk/dvipsk/afm2tfm.c 2009-07-04 10:12:20.843158881 +0200 | |
58 | +++ texlive-20080816-source/texk/dvipsk/afm2tfm.c 2009-07-04 11:00:22.889536405 +0200 | |
59 | @@ -260,7 +260,7 @@ | |
60 | } | |
61 | ||
62 | int | |
63 | -getline P1H(void) { | |
64 | +tl_getline P1H(void) { | |
65 | register char *p ; | |
66 | register int c ; | |
67 | ||
68 | @@ -615,7 +615,7 @@ | |
69 | ai = newchar() ; | |
70 | ai->adobenum = -1 ; | |
71 | ai->adobename = "||" ; /* boundary character name */ | |
72 | - while (getline()) { | |
73 | + while (tl_getline()) { | |
74 | switch(interest(paramstring())) { | |
75 | case FontName: | |
76 | fontname = paramnewstring() ; | |
77 | @@ -1891,7 +1891,7 @@ | |
78 | ||
79 | while (1) { | |
80 | while (param == 0 || *param == 0) { | |
81 | - if (getline() == 0) | |
82 | + if (tl_getline() == 0) | |
83 | error("! premature end in encoding file") ; | |
84 | for (p=buffer; *p; p++) | |
85 | if (*p == '%') { | |
86 | @@ -1982,7 +1982,7 @@ | |
87 | p = gettoken() ; | |
88 | if (strcmp(p, "]")) | |
89 | error("! token 258 in encoding must be make-array (])") ; | |
90 | - while (getline()) { | |
91 | + while (tl_getline()) { | |
92 | for (p=buffer; *p; p++) | |
93 | if (*p == '%') { | |
94 | if (ignoreligkern == 0) | |
95 | --- texlive-20080816-source.orig/texk/web2c/cpascal.h 2009-07-04 10:12:24.699825510 +0200 | |
96 | +++ texlive-20080816-source/texk/web2c/cpascal.h 2009-07-04 11:02:06.002863123 +0200 | |
97 | @@ -14,6 +14,7 @@ | |
98 | ||
99 | /* We must include this first, to resolve many C issues. */ | |
100 | #include "config.h" | |
101 | +#define getline tl_getline | |
102 | ||
103 | /* We only use getopt in the applications, not in web2c itself. */ | |
104 | #include <kpathsea/getopt.h> | |
105 | --- texlive-20080816-source.orig/texk/web2c/mpware/mpto.c 2009-07-04 10:12:23.563158028 +0200 | |
106 | +++ texlive-20080816-source/texk/web2c/mpware/mpto.c 2009-07-04 11:03:43.946185385 +0200 | |
107 | @@ -97,7 +97,7 @@ | |
108 | } | |
109 | ||
110 | char * | |
111 | -getline(void) | |
112 | +tl_getline(void) | |
113 | { /* returns NULL on EOF or error, otherwise buf */ | |
114 | int c; | |
115 | unsigned loc = 0; | |
116 | @@ -302,7 +302,7 @@ | |
117 | char *res = NULL; | |
118 | do { | |
119 | if (*aa == 0) | |
120 | - if ((aa = getline()) == NULL) | |
121 | + if ((aa = tl_getline()) == NULL) | |
122 | err("btex section does not end"); | |
123 | ||
124 | if (getbta(aa) && *tt == 'e') { | |
125 | @@ -483,7 +483,7 @@ | |
126 | postverb = troff_postverb; | |
127 | } | |
128 | printf("%s", predoc); | |
129 | - while (getline() != NULL) | |
130 | + while (tl_getline() != NULL) | |
131 | do_line(); | |
132 | printf("%s", postdoc); | |
133 | exit(0); |