- release 23 (by relup.sh)

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

diff --git a/texlive-getline.patch b/texlive-getline.patch
index d495d32d125e9cdd0b37a3ce5a7e2e3087e19282..aba4f0c88c25521472b228e4b28370e968e470c6 100644 (file)
--- a/texlive-getline.patch
+++ b/texlive-getline.patch
@@ -259,3 +259,102 @@
      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]);