[packages/texlive.git] / texlive-getline.patch

--- texlive-20080816-source.orig/texk/afm2pl/afm2pl.c	2009-07-04 10:12:19.883158871 +0200
+++ texlive-20080816-source/texk/afm2pl/afm2pl.c	2009-07-04 10:58:24.613569483 +0200
@@ -345,7 +345,7 @@
 
 /* read a line from infile into buffer and obuffer */
 int
-  getline
+  tl_getline
 P1H (void)
 {
   register char *p;
@@ -781,7 +781,7 @@
     afmencoding->vec[i] = ".notdef";
   afmencoding->name = "Unspecified";
 
-  while (getline ()) {
+  while (tl_getline ()) {
     switch (interest (paramstring ())) {
     case FontName:
       fontname = paramnewstring ();
@@ -963,7 +963,7 @@
 
   while (1) {
     while (param == 0 || *param == 0) {
-      if (getline () == 0)
+      if (tl_getline () == 0)
         error ("! premature end in encoding file");
     }
     if (param[0] == '%') {
@@ -1540,7 +1540,7 @@
     encfilename =
       openin (encfilename, kpse_enc_format, ".enc");
     for (lig_it = 0; lig_it < 2; lig_it++) {
-      while (getline ()) {
+      while (tl_getline ()) {
         /* search for (ligkern) comment in line */
         for (p = buffer; *p; p++)
           if (*p == '%') {
@@ -1576,7 +1576,7 @@
     for (i = 0; i < ligfilenames->n; i++) {
       ligfilename = openin (ligfilenames->names[i],
                             kpse_lig_format, ".lig");
-      while (getline ())
+      while (tl_getline ())
         checkligkern (buffer, 0);       /* 2nd param 0: lig file */
       fclose (infile);
     }
@@ -1607,7 +1607,7 @@
   for (i = 0; i < Ligfilenames->n; i++) {
     ligfilename = openin (Ligfilenames->names[i],
                           kpse_lig_format, ".lig");
-    while (getline ())
+    while (tl_getline ())
       checkligkern (buffer, 0);       /* 2nd param 0: lig file */
     fclose (infile);
   }
--- texlive-20080816-source.orig/texk/dvipsk/afm2tfm.c	2009-07-04 10:12:20.843158881 +0200
+++ texlive-20080816-source/texk/dvipsk/afm2tfm.c	2009-07-04 11:00:22.889536405 +0200
@@ -260,7 +260,7 @@
 }
 
 int
-getline P1H(void) {
+tl_getline P1H(void) {
    register char *p ;
    register int c ;
 
@@ -615,7 +615,7 @@
    ai = newchar() ;
    ai->adobenum = -1 ;
    ai->adobename = "||" ; /* boundary character name */
-   while (getline()) {
+   while (tl_getline()) {
       switch(interest(paramstring())) {
 case FontName:
          fontname = paramnewstring() ;
@@ -1891,7 +1891,7 @@
 
    while (1) {
       while (param == 0 || *param == 0) {
-         if (getline() == 0)
+         if (tl_getline() == 0)
             error("! premature end in encoding file") ;
          for (p=buffer; *p; p++)
             if (*p == '%') {
@@ -1982,7 +1982,7 @@
       p = gettoken() ;
       if (strcmp(p, "]"))
          error("! token 258 in encoding must be make-array (])") ;
-      while (getline()) {
+      while (tl_getline()) {
          for (p=buffer; *p; p++)
             if (*p == '%') {
                if (ignoreligkern == 0)
--- texlive-20080816-source.orig/texk/web2c/cpascal.h	2009-07-04 10:12:24.699825510 +0200
+++ texlive-20080816-source/texk/web2c/cpascal.h	2009-07-04 11:02:06.002863123 +0200
@@ -14,6 +14,7 @@
 
 /* We must include this first, to resolve many C issues.  */
 #include "config.h"
+#define getline tl_getline
 
 /* We only use getopt in the applications, not in web2c itself.  */
 #include <kpathsea/getopt.h>
--- texlive-20080816-source.orig/texk/web2c/mpware/mpto.c	2009-07-04 10:12:23.563158028 +0200
+++ texlive-20080816-source/texk/web2c/mpware/mpto.c	2009-07-04 11:03:43.946185385 +0200
@@ -97,7 +97,7 @@
 }
 
 char *
-getline(void)
+tl_getline(void)
 {				/* returns NULL on EOF or error, otherwise buf */
     int c;
     unsigned loc = 0;
@@ -302,7 +302,7 @@
     char *res = NULL;
     do {
 	if (*aa == 0)
-	  if ((aa = getline()) == NULL)
+	  if ((aa = tl_getline()) == NULL)
 	    err("btex section does not end");
 
 	if (getbta(aa) && *tt == 'e') {
@@ -483,7 +483,7 @@
 	postverb = troff_postverb;
     }
     printf("%s", predoc);
-    while (getline() != NULL)
+    while (tl_getline() != NULL)
 	do_line();
     printf("%s", postdoc);
     exit(0);
--- texlive-20080816-source.orig/texk/web2c/tangleboot.p	2009-07-04 10:12:24.699825510 +0200
+++ texlive-20080816-source/texk/web2c/tangleboot.p	2009-07-04 12:21:16.892931576 +0200
@@ -577,7 +577,7 @@
 if not inputln(webfile)then begin begin writeln(stdout);
 write(stdout,'! WEB file ended during a change');error;end;
 inputhasended:=true;goto 10;end;if linesdontmatch then n:=n+1;end;
-10:end;{:132}{135:}procedure getline;label 20;
+10:end;{:132}{135:}procedure tl_getline;label 20;
 begin 20:if changing then{137:}begin line:=line+1;
 if not inputln(changefile)then begin begin writeln(stdout);
 write(stdout,'! Change file ended without @z');error;end;buffer[0]:=64;
@@ -604,13 +604,13 @@
 60:controlcode:=135;61:controlcode:=2;92:controlcode:=3;
 others:controlcode:=0 end;end;{:139}{140:}function skipahead:eightbits;
 label 30;var c:eightbits;
-begin while true do begin if loc>limit then begin getline;
+begin while true do begin if loc>limit then begin tl_getline;
 if inputhasended then begin c:=136;goto 30;end;end;buffer[limit+1]:=64;
 while buffer[loc]<>64 do loc:=loc+1;if loc<=limit then begin loc:=loc+2;
 c:=controlcode(buffer[loc-1]);if(c<>0)or(buffer[loc-1]=62)then goto 30;
 end;end;30:skipahead:=c;end;{:140}{141:}procedure skipcomment;label 10;
 var bal:eightbits;c:ASCIIcode;begin bal:=0;
-while true do begin if loc>limit then begin getline;
+while true do begin if loc>limit then begin tl_getline;
 if inputhasended then begin begin writeln(stdout);
 write(stdout,'! Input ended in mid-comment');error;end;goto 10;end;end;
 c:=buffer[loc];loc:=loc+1;{142:}if c=64 then begin c:=buffer[loc];
@@ -622,7 +622,7 @@
 then bal:=bal+1 else if c=125 then begin if bal=0 then goto 10;
 bal:=bal-1;end{:142};end;10:end;{:141}{145:}function getnext:eightbits;
 label 20,30,31;var c:eightbits;d:eightbits;j,k:0..longestname;
-begin 20:if loc>limit then begin getline;
+begin 20:if loc>limit then begin tl_getline;
 if inputhasended then begin c:=136;goto 31;end;end;c:=buffer[loc];
 loc:=loc+1;
 if scanninghex then{146:}if((c>=48)and(c<=57))or((c>=65)and(c<=70))then
@@ -647,7 +647,7 @@
 64:{150:}begin c:=controlcode(buffer[loc]);loc:=loc+1;
 if c=0 then goto 20 else if c=13 then scanninghex:=true else if c=135
 then{151:}begin{153:}k:=0;
-while true do begin if loc>limit then begin getline;
+while true do begin if loc>limit then begin tl_getline;
 if inputhasended then begin begin writeln(stdout);
 write(stdout,'! Input ended in section name');error;end;goto 30;end;end;
 d:=buffer[loc];{154:}if d=64 then begin d:=buffer[loc+1];
--- texlive-20080816-source.orig/texk/dvi2tty/dvistuff.c	2009-07-04 10:12:21.486492239 +0200
+++ texlive-20080816-source/texk/dvi2tty/dvistuff.c	2009-07-04 12:34:19.938973989 +0200
@@ -123,7 +123,7 @@
 void            ruleaux         P3H(long, long, char);
 long            horizontalmove  P1H(long);
 int             skipnops        P1H(void);
-linetype    *   getline         P1H(void);
+linetype    *   tl_getline         P1H(void);
 linetype    *   findline        P1H(void);
 unsigned long   num             P1H(int);
 long            snum            P1H(int);
@@ -149,7 +149,7 @@
 void            ruleaux         (long, long, char);
 long            horizontalmove  (long);
 int             skipnops        (void);
-linetype    *   getline         (void);
+linetype    *   tl_getline         (void);
 linetype    *   findline        (void);
 unsigned long   num             (int);
 long            snum            (int);
@@ -174,7 +174,7 @@
 void            ruleaux         ();
 long            horizontalmove  ();
 int             skipnops        ();
-linetype    *   getline         ();
+linetype    *   tl_getline         ();
 linetype    *   findline        ();
 unsigned long   num             ();
 long            snum            ();
@@ -316,7 +316,7 @@
     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 = tl_getline();                /* initialize list of lines */
     currentline->vv = 0L;
     firstline   = currentline;
     lastline    = currentline;
@@ -671,7 +671,7 @@
 
 /*----------------------------------------------------------------------------*/
 
-linetype *getline()             /* returns an initialized line-object */
+linetype *tl_getline()             /* returns an initialized line-object */
 {
     register int  i;
     register linetype *temp;
@@ -686,7 +686,7 @@
     temp->text[i] = '\0';
     return temp;
 
-} /* getline */
+} /* tl_getline */
 
 /*----------------------------------------------------------------------------*/
 
@@ -697,7 +697,7 @@
 
     if (v <= firstline->vv) {                      /* above first line */
         if (firstline->vv - v > VERTICALEPSILON) {
-            temp = getline();
+            temp = tl_getline();
             temp->next = firstline;
             firstline->prev = temp;
             temp->vv = v;
@@ -708,7 +708,7 @@
 
     if (v >= lastline->vv) {                       /* below last line */
         if (v - lastline->vv > VERTICALEPSILON) {
-            temp = getline();
+            temp = tl_getline();
             temp->prev = lastline;
             lastline->next = temp;
             temp->vv = v;
@@ -732,7 +732,7 @@
     }
 
     /* no line fits suitable, generate a new one */
-    currentline = getline();
+    currentline = tl_getline();
     currentline->next = temp->next;
     currentline->prev = temp;
     temp->next->prev = currentline;
--- texlive-20080816-source.orig/texk/ttf2pk/newobj.c	2009-07-04 10:12:21.579825377 +0200
+++ texlive-20080816-source/texk/ttf2pk/newobj.c	2009-07-04 13:24:44.943254190 +0200
@@ -134,7 +134,7 @@
  */
 
 Boolean
-getline(char **bufferp, FILE *f)
+tl_getline(char **bufferp, FILE *f)
 {
   size_t l;
 
--- texlive-20080816-source.orig/texk/ttf2pk/newobj.h	2009-07-04 10:12:21.536492551 +0200
+++ texlive-20080816-source/texk/ttf2pk/newobj.h	2009-07-04 13:25:35.789915748 +0200
@@ -26,7 +26,7 @@
 void *myrealloc(void *oldp, size_t len);
 
 char *get_line(FILE *f);
-Boolean getline(char **bufferp, FILE *f);
+Boolean tl_getline(char **bufferp, FILE *f);
 char *newstring(char *s);
 
 ttfinfo *newchar(Font *fnt);
--- texlive-20080816-source.orig/texk/ttf2pk/parse.c	2009-07-04 10:12:21.576492082 +0200
+++ texlive-20080816-source/texk/ttf2pk/parse.c	2009-07-04 13:26:10.178664088 +0200
@@ -63,7 +63,7 @@
       if (*bufferp)
         free(*bufferp);
 
-      if (getline(bufferp, f) == False)
+      if (tl_getline(bufferp, f) == False)
         oops("Premature end in encoding file.");
 
       curp = *bufferp;
@@ -187,7 +187,7 @@
         "Token 258 in encoding must be make-array (]).");
     free(p);
 
-    while (getline(&buffer, enc_file))
+    while (tl_getline(&buffer, enc_file))
     {
       for (p = buffer; *p; p++)
         if (*p == '%')
@@ -246,7 +246,7 @@
   if (replacement_file == NULL)
     oops("Cannot open replacement file `%s'.", real_replacement_name);
 
-  while (getline(&buffer, replacement_file))
+  while (tl_getline(&buffer, replacement_file))
   {
     for (p = buffer; *p; p++)
       if (*p == '%')
--- texlive-20080816-source.orig/libs/lua51/ldebug.c	2009-07-04 10:12:19.813158914 +0200
+++ texlive-20080816-source/libs/lua51/ldebug.c	2009-07-06 12:07:17.645671661 +0200
@@ -48,7 +48,7 @@
   if (pc < 0)
     return -1;  /* only active lua functions have current-line information */
   else
-    return getline(ci_func(ci)->l.p, pc);
+    return tl_getline(ci_func(ci)->l.p, pc);
 }
 
 
--- texlive-20080816-source.orig/libs/lua51/ldebug.h	2009-07-04 10:12:19.813158914 +0200
+++ texlive-20080816-source/libs/lua51/ldebug.h	2009-07-06 12:07:17.648962801 +0200
@@ -13,7 +13,7 @@
 
 #define pcRel(pc, p)	(cast(int, (pc) - (p)->code) - 1)
 
-#define getline(f,pc)	(((f)->lineinfo) ? (f)->lineinfo[pc] : 0)
+#define tl_getline(f,pc)	(((f)->lineinfo) ? (f)->lineinfo[pc] : 0)
 
 #define resethookcount(L)	(L->hookcount = L->basehookcount)
 
--- texlive-20080816-source.orig/libs/lua51/lvm.c	2009-07-04 10:12:19.816492277 +0200
+++ texlive-20080816-source/libs/lua51/lvm.c	2009-07-06 12:07:17.702572571 +0200
@@ -70,10 +70,10 @@
   if (mask & LUA_MASKLINE) {
     Proto *p = ci_func(L->ci)->l.p;
     int npc = pcRel(pc, p);
-    int newline = getline(p, npc);
+    int newline = tl_getline(p, npc);
     /* call linehook when enter a new function, when jump back (loop),
        or when enter a new line */
-    if (npc == 0 || pc <= oldpc || newline != getline(p, pcRel(oldpc, p)))
+    if (npc == 0 || pc <= oldpc || newline != tl_getline(p, pcRel(oldpc, p)))
       luaD_callhook(L, LUA_HOOKLINE, newline);
   }
 }
--- texlive-20080816-source.orig/libs/lua51/print.c	2009-07-04 10:12:19.813158914 +0200
+++ texlive-20080816-source/libs/lua51/print.c	2009-07-06 12:07:17.705304192 +0200
@@ -84,7 +84,7 @@
   int c=GETARG_C(i);
   int bx=GETARG_Bx(i);
   int sbx=GETARG_sBx(i);
-  int line=getline(f,pc);
+  int line=tl_getline(f,pc);
   printf("\t%d\t",pc+1);
   if (line>0) printf("[%d]\t",line); else printf("[-]\t");
   printf("%-9s\t",luaP_opnames[o]);
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);
98974bdc ZU	134	--- texlive-20080816-source.orig/texk/web2c/tangleboot.p 2009-07-04 10:12:24.699825510 +0200
	135	+++ texlive-20080816-source/texk/web2c/tangleboot.p 2009-07-04 12:21:16.892931576 +0200
	136	@@ -577,7 +577,7 @@
	137	if not inputln(webfile)then begin begin writeln(stdout);
	138	write(stdout,'! WEB file ended during a change');error;end;
	139	inputhasended:=true;goto 10;end;if linesdontmatch then n:=n+1;end;
	140	-10:end;{:132}{135:}procedure getline;label 20;
	141	+10:end;{:132}{135:}procedure tl_getline;label 20;
	142	begin 20:if changing then{137:}begin line:=line+1;
	143	if not inputln(changefile)then begin begin writeln(stdout);
	144	write(stdout,'! Change file ended without @z');error;end;buffer[0]:=64;
	145	@@ -604,13 +604,13 @@
	146	60:controlcode:=135;61:controlcode:=2;92:controlcode:=3;
	147	others:controlcode:=0 end;end;{:139}{140:}function skipahead:eightbits;
	148	label 30;var c:eightbits;
	149	-begin while true do begin if loc>limit then begin getline;
	150	+begin while true do begin if loc>limit then begin tl_getline;
	151	if inputhasended then begin c:=136;goto 30;end;end;buffer[limit+1]:=64;
	152	while buffer[loc]<>64 do loc:=loc+1;if loc<=limit then begin loc:=loc+2;
	153	c:=controlcode(buffer[loc-1]);if(c<>0)or(buffer[loc-1]=62)then goto 30;
	154	end;end;30:skipahead:=c;end;{:140}{141:}procedure skipcomment;label 10;
	155	var bal:eightbits;c:ASCIIcode;begin bal:=0;
	156	-while true do begin if loc>limit then begin getline;
	157	+while true do begin if loc>limit then begin tl_getline;
	158	if inputhasended then begin begin writeln(stdout);
	159	write(stdout,'! Input ended in mid-comment');error;end;goto 10;end;end;
	160	c:=buffer[loc];loc:=loc+1;{142:}if c=64 then begin c:=buffer[loc];
	161	@@ -622,7 +622,7 @@
	162	then bal:=bal+1 else if c=125 then begin if bal=0 then goto 10;
	163	bal:=bal-1;end{:142};end;10:end;{:141}{145:}function getnext:eightbits;
	164	label 20,30,31;var c:eightbits;d:eightbits;j,k:0..longestname;
	165	-begin 20:if loc>limit then begin getline;
	166	+begin 20:if loc>limit then begin tl_getline;
	167	if inputhasended then begin c:=136;goto 31;end;end;c:=buffer[loc];
	168	loc:=loc+1;
	169	if scanninghex then{146:}if((c>=48)and(c<=57))or((c>=65)and(c<=70))then
	170	@@ -647,7 +647,7 @@
	171	64:{150:}begin c:=controlcode(buffer[loc]);loc:=loc+1;
	172	if c=0 then goto 20 else if c=13 then scanninghex:=true else if c=135
	173	then{151:}begin{153:}k:=0;
	174	-while true do begin if loc>limit then begin getline;
	175	+while true do begin if loc>limit then begin tl_getline;
	176	if inputhasended then begin begin writeln(stdout);
	177	write(stdout,'! Input ended in section name');error;end;goto 30;end;end;
	178	d:=buffer[loc];{154:}if d=64 then begin d:=buffer[loc+1];
	179	--- texlive-20080816-source.orig/texk/dvi2tty/dvistuff.c 2009-07-04 10:12:21.486492239 +0200
	180	+++ texlive-20080816-source/texk/dvi2tty/dvistuff.c 2009-07-04 12:34:19.938973989 +0200
	181	@@ -123,7 +123,7 @@
	182	void ruleaux P3H(long, long, char);
	183	long horizontalmove P1H(long);
	184	int skipnops P1H(void);
	185	-linetype * getline P1H(void);
	186	+linetype * tl_getline P1H(void);
	187	linetype * findline P1H(void);
	188	unsigned long num P1H(int);
	189	long snum P1H(int);
	190	@@ -149,7 +149,7 @@
	191	void ruleaux (long, long, char);
	192	long horizontalmove (long);
	193	int skipnops (void);
	194	-linetype * getline (void);
	195	+linetype * tl_getline (void);
	196	linetype * findline (void);
	197	unsigned long num (int);
198	long snum (int);
199	@@ -174,7 +174,7 @@
200	void ruleaux ();
201	long horizontalmove ();
202	int skipnops ();
203	-linetype * getline ();
204	+linetype * tl_getline ();
205	linetype * findline ();
206	unsigned long num ();
207	long snum ();
208	@@ -316,7 +316,7 @@
209	h = 0L; v = 0L; /* initialize coordinates */
210	x = 0L; w = 0L; y = 0L; z = 0L; /* initialize amounts */
211	sptr = 0; /* initialize stack */
212	- currentline = getline(); /* initialize list of lines */
213	+ currentline = tl_getline(); /* initialize list of lines */
214	currentline->vv = 0L;
215	firstline = currentline;
216	lastline = currentline;
217	@@ -671,7 +671,7 @@
218
219	/----------------------------------------------------------------------------/
220
221	-linetype getline() / returns an initialized line-object */
222	+linetype tl_getline() / returns an initialized line-object */
223	{
224	register int i;
225	register linetype *temp;
226	@@ -686,7 +686,7 @@
227	temp->text[i] = '\0';
228	return temp;
229
230	-} /* getline */
231	+} /* tl_getline */
232
233	/----------------------------------------------------------------------------/
234
235	@@ -697,7 +697,7 @@
236
237	if (v <= firstline->vv) { /* above first line */
238	if (firstline->vv - v > VERTICALEPSILON) {
239	- temp = getline();
240	+ temp = tl_getline();
241	temp->next = firstline;
242	firstline->prev = temp;
243	temp->vv = v;
244	@@ -708,7 +708,7 @@
245
246	if (v >= lastline->vv) { /* below last line */
247	if (v - lastline->vv > VERTICALEPSILON) {
248	- temp = getline();
249	+ temp = tl_getline();
250	temp->prev = lastline;
251	lastline->next = temp;
252	temp->vv = v;
253	@@ -732,7 +732,7 @@
254	}
255
256	/* no line fits suitable, generate a new one */
257	- currentline = getline();
258	+ currentline = tl_getline();
259	currentline->next = temp->next;
260	currentline->prev = temp;
261	temp->next->prev = currentline;
868db2c3 ZU	262	--- texlive-20080816-source.orig/texk/ttf2pk/newobj.c 2009-07-04 10:12:21.579825377 +0200
	263	+++ texlive-20080816-source/texk/ttf2pk/newobj.c 2009-07-04 13:24:44.943254190 +0200
	264	@@ -134,7 +134,7 @@
	265	*/
	266
	267	Boolean
	268	-getline(char *bufferp, FILE f)
	269	+tl_getline(char *bufferp, FILE f)
	270	{
	271	size_t l;
	272
	273	--- texlive-20080816-source.orig/texk/ttf2pk/newobj.h 2009-07-04 10:12:21.536492551 +0200
	274	+++ texlive-20080816-source/texk/ttf2pk/newobj.h 2009-07-04 13:25:35.789915748 +0200
	275	@@ -26,7 +26,7 @@
	276	void myrealloc(void oldp, size_t len);
	277
	278	char get_line(FILE f);
	279	-Boolean getline(char *bufferp, FILE f);
	280	+Boolean tl_getline(char *bufferp, FILE f);
	281	char newstring(char s);
	282
	283	ttfinfo newchar(Font fnt);
	284	--- texlive-20080816-source.orig/texk/ttf2pk/parse.c 2009-07-04 10:12:21.576492082 +0200
	285	+++ texlive-20080816-source/texk/ttf2pk/parse.c 2009-07-04 13:26:10.178664088 +0200
	286	@@ -63,7 +63,7 @@
	287	if (*bufferp)
	288	free(*bufferp);
	289
	290	- if (getline(bufferp, f) == False)
	291	+ if (tl_getline(bufferp, f) == False)
	292	oops("Premature end in encoding file.");
	293
	294	curp = *bufferp;
	295	@@ -187,7 +187,7 @@
	296	"Token 258 in encoding must be make-array (]).");
	297	free(p);
	298
	299	- while (getline(&buffer, enc_file))
	300	+ while (tl_getline(&buffer, enc_file))
	301	{
	302	for (p = buffer; *p; p++)
	303	if (*p == '%')
	304	@@ -246,7 +246,7 @@
	305	if (replacement_file == NULL)
	306	oops("Cannot open replacement file `%s'.", real_replacement_name);
	307
	308	- while (getline(&buffer, replacement_file))
	309	+ while (tl_getline(&buffer, replacement_file))
	310	{
	311	for (p = buffer; *p; p++)
	312	if (*p == '%')
b9501f5d ZU	313	--- texlive-20080816-source.orig/libs/lua51/ldebug.c 2009-07-04 10:12:19.813158914 +0200
	314	+++ texlive-20080816-source/libs/lua51/ldebug.c 2009-07-06 12:07:17.645671661 +0200
	315	@@ -48,7 +48,7 @@
	316	if (pc < 0)
	317	return -1; /* only active lua functions have current-line information */
	318	else
	319	- return getline(ci_func(ci)->l.p, pc);
	320	+ return tl_getline(ci_func(ci)->l.p, pc);
	321	}
	322
	323
	324	--- texlive-20080816-source.orig/libs/lua51/ldebug.h 2009-07-04 10:12:19.813158914 +0200
	325	+++ texlive-20080816-source/libs/lua51/ldebug.h 2009-07-06 12:07:17.648962801 +0200
	326	@@ -13,7 +13,7 @@
	327
	328	#define pcRel(pc, p) (cast(int, (pc) - (p)->code) - 1)
	329
	330	-#define getline(f,pc) (((f)->lineinfo) ? (f)->lineinfo[pc] : 0)
	331	+#define tl_getline(f,pc) (((f)->lineinfo) ? (f)->lineinfo[pc] : 0)
	332
	333	#define resethookcount(L) (L->hookcount = L->basehookcount)
	334
	335	--- texlive-20080816-source.orig/libs/lua51/lvm.c 2009-07-04 10:12:19.816492277 +0200
	336	+++ texlive-20080816-source/libs/lua51/lvm.c 2009-07-06 12:07:17.702572571 +0200
	337	@@ -70,10 +70,10 @@
	338	if (mask & LUA_MASKLINE) {
	339	Proto *p = ci_func(L->ci)->l.p;
	340	int npc = pcRel(pc, p);
	341	- int newline = getline(p, npc);
	342	+ int newline = tl_getline(p, npc);
	343	/* call linehook when enter a new function, when jump back (loop),
	344	or when enter a new line */
	345	- if (npc == 0 \|\| pc <= oldpc \|\| newline != getline(p, pcRel(oldpc, p)))
	346	+ if (npc == 0 \|\| pc <= oldpc \|\| newline != tl_getline(p, pcRel(oldpc, p)))
	347	luaD_callhook(L, LUA_HOOKLINE, newline);
	348	}
	349	}
	350	--- texlive-20080816-source.orig/libs/lua51/print.c 2009-07-04 10:12:19.813158914 +0200
	351	+++ texlive-20080816-source/libs/lua51/print.c 2009-07-06 12:07:17.705304192 +0200
	352	@@ -84,7 +84,7 @@
	353	int c=GETARG_C(i);
	354	int bx=GETARG_Bx(i);
	355	int sbx=GETARG_sBx(i);
	356	- int line=getline(f,pc);
	357	+ int line=tl_getline(f,pc);
	358	printf("\t%d\t",pc+1);
	359	if (line>0) printf("[%d]\t",line); else printf("[-]\t");
	360	printf("%-9s\t",luaP_opnames[o]);