| 1 |
diff -up texlive-2007/texk/afm2pl/afm2pl.c.getline texlive-2007/texk/afm2pl/afm2pl.c
|
| 2 |
--- texlive-2007/texk/afm2pl/afm2pl.c.getline 2006-01-17 22:41:51.000000000 +0100
|
| 3 |
+++ texlive-2007/texk/afm2pl/afm2pl.c 2009-04-02 15:18:30.000000000 +0200
|
| 4 |
@@ -345,7 +345,7 @@ P2C (register int, x, register int, y)
|
| 5 |
|
| 6 |
/* read a line from infile into buffer and obuffer */
|
| 7 |
int
|
| 8 |
- getline
|
| 9 |
+ _getline
|
| 10 |
P1H (void)
|
| 11 |
{
|
| 12 |
register char *p;
|
| 13 |
@@ -781,7 +781,7 @@ P1H (void)
|
| 14 |
afmencoding->vec[i] = ".notdef";
|
| 15 |
afmencoding->name = "Unspecified";
|
| 16 |
|
| 17 |
- while (getline ()) {
|
| 18 |
+ while (_getline ()) {
|
| 19 |
switch (interest (paramstring ())) {
|
| 20 |
case FontName:
|
| 21 |
fontname = paramnewstring ();
|
| 22 |
@@ -963,7 +963,7 @@ gettoken ()
|
| 23 |
|
| 24 |
while (1) {
|
| 25 |
while (param == 0 || *param == 0) {
|
| 26 |
- if (getline () == 0)
|
| 27 |
+ if (_getline () == 0)
|
| 28 |
error ("! premature end in encoding file");
|
| 29 |
}
|
| 30 |
if (param[0] == '%') {
|
| 31 |
@@ -1540,7 +1540,7 @@ extraligkerninfo ()
|
| 32 |
encfilename =
|
| 33 |
openin (encfilename, kpse_enc_format, ".enc");
|
| 34 |
for (lig_it = 0; lig_it < 2; lig_it++) {
|
| 35 |
- while (getline ()) {
|
| 36 |
+ while (_getline ()) {
|
| 37 |
/* search for (ligkern) comment in line */
|
| 38 |
for (p = buffer; *p; p++)
|
| 39 |
if (*p == '%') {
|
| 40 |
@@ -1576,7 +1576,7 @@ extraligkerninfo ()
|
| 41 |
for (i = 0; i < ligfilenames->n; i++) {
|
| 42 |
ligfilename = openin (ligfilenames->names[i],
|
| 43 |
kpse_lig_format, ".lig");
|
| 44 |
- while (getline ())
|
| 45 |
+ while (_getline ())
|
| 46 |
checkligkern (buffer, 0); /* 2nd param 0: lig file */
|
| 47 |
fclose (infile);
|
| 48 |
}
|
| 49 |
@@ -1607,7 +1607,7 @@ extraligkerninfo ()
|
| 50 |
for (i = 0; i < Ligfilenames->n; i++) {
|
| 51 |
ligfilename = openin (Ligfilenames->names[i],
|
| 52 |
kpse_lig_format, ".lig");
|
| 53 |
- while (getline ())
|
| 54 |
+ while (_getline ())
|
| 55 |
checkligkern (buffer, 0); /* 2nd param 0: lig file */
|
| 56 |
fclose (infile);
|
| 57 |
}
|
| 58 |
diff -up texlive-2007/texk/dvipsk/afm2tfm.c.getline texlive-2007/texk/dvipsk/afm2tfm.c
|
| 59 |
--- texlive-2007/texk/dvipsk/afm2tfm.c.getline 2009-04-02 15:10:49.000000000 +0200
|
| 60 |
+++ texlive-2007/texk/dvipsk/afm2tfm.c 2009-04-02 15:20:59.000000000 +0200
|
| 61 |
@@ -257,7 +257,7 @@ transform P2C(register int, x, register
|
| 62 |
}
|
| 63 |
|
| 64 |
int
|
| 65 |
-getline P1H(void) {
|
| 66 |
+_getline P1H(void) {
|
| 67 |
register char *p ;
|
| 68 |
register int c ;
|
| 69 |
|
| 70 |
@@ -612,7 +612,7 @@ readadobe P1H(void) {
|
| 71 |
ai = newchar() ;
|
| 72 |
ai->adobenum = -1 ;
|
| 73 |
ai->adobename = "||" ; /* boundary character name */
|
| 74 |
- while (getline()) {
|
| 75 |
+ while (_getline()) {
|
| 76 |
switch(interest(paramstring())) {
|
| 77 |
case FontName:
|
| 78 |
fontname = paramnewstring() ;
|
| 79 |
@@ -1888,7 +1888,7 @@ char *gettoken() {
|
| 80 |
|
| 81 |
while (1) {
|
| 82 |
while (param == 0 || *param == 0) {
|
| 83 |
- if (getline() == 0)
|
| 84 |
+ if (_getline() == 0)
|
| 85 |
error("! premature end in encoding file") ;
|
| 86 |
for (p=buffer; *p; p++)
|
| 87 |
if (*p == '%') {
|
| 88 |
@@ -1979,7 +1979,7 @@ struct encoding *readencoding P1C(char *
|
| 89 |
p = gettoken() ;
|
| 90 |
if (strcmp(p, "]"))
|
| 91 |
error("! token 258 in encoding must be make-array (])") ;
|
| 92 |
- while (getline()) {
|
| 93 |
+ while (_getline()) {
|
| 94 |
for (p=buffer; *p; p++)
|
| 95 |
if (*p == '%') {
|
| 96 |
if (ignoreligkern == 0)
|
| 97 |
diff -up texlive-2007/texk/web2c/cpascal.h.getline texlive-2007/texk/web2c/cpascal.h
|
| 98 |
--- texlive-2007/texk/web2c/cpascal.h.getline 2006-12-27 00:37:34.000000000 +0100
|
| 99 |
+++ texlive-2007/texk/web2c/cpascal.h 2009-04-02 15:10:49.000000000 +0200
|
| 100 |
@@ -14,6 +14,7 @@
|
| 101 |
|
| 102 |
/* We must include this first, to resolve many C issues. */
|
| 103 |
#include "config.h"
|
| 104 |
+#define getline _getline
|
| 105 |
|
| 106 |
/* We only use getopt in the applications, not in web2c itself. */
|
| 107 |
#include <kpathsea/getopt.h>
|
| 108 |
diff -up texlive-2007/texk/web2c/mpware/mpto.c.getline texlive-2007/texk/web2c/mpware/mpto.c
|
| 109 |
--- texlive-2007/texk/web2c/mpware/mpto.c.getline 2006-11-28 14:24:53.000000000 +0100
|
| 110 |
+++ texlive-2007/texk/web2c/mpware/mpto.c 2009-04-02 15:10:50.000000000 +0200
|
| 111 |
@@ -99,7 +95,7 @@ usage(char *progn)
|
| 112 |
}
|
| 113 |
|
| 114 |
char *
|
| 115 |
-getline(void)
|
| 116 |
+_getline(void)
|
| 117 |
{ /* returns NULL on EOF or error, otherwise buf */
|
| 118 |
int c;
|
| 119 |
unsigned loc = 0;
|
| 120 |
@@ -304,11 +300,11 @@ copytex(void)
|
| 121 |
while (*aa == ' ' || *aa == '\t')
|
| 122 |
aa++;
|
| 123 |
if (*aa == 0)
|
| 124 |
- if ((aa = getline()) == NULL)
|
| 125 |
+ if ((aa = _getline()) == NULL)
|
| 126 |
err("btex section does not end");
|
| 127 |
do {
|
| 128 |
if (*aa == 0)
|
| 129 |
- if ((aa = getline()) == NULL)
|
| 130 |
+ if ((aa = _getline()) == NULL)
|
| 131 |
err("btex section does not end");
|
| 132 |
else
|
| 133 |
printf("\n");
|
| 134 |
@@ -465,7 +461,7 @@ Current maintainer: Taco Hoekwater.\n");
|
| 135 |
postverb = troff_postverb;
|
| 136 |
}
|
| 137 |
printf("%s", predoc);
|
| 138 |
- while (getline() != NULL)
|
| 139 |
+ while (_getline() != NULL)
|
| 140 |
do_line();
|
| 141 |
printf("%s", postdoc);
|
| 142 |
exit(0);
|
Parent Directory
| 
Revision Log