Re: Tetex issue and fix

[Guy Dalziel]

On Fri, Aug 07, 2009 at 01:53:00AM +0000, William Immendorf wrote:
> Anyone have a fix?

See attached.

Submitted By: Guy Dalziel <gdalziel at linuxfromscratch dot org>
Date: 2009-08-07
Initial Package Version: 3.0 
Upstream Status: unknown
Origin: http://lists.ibiblio.org/pipermail/sm-commit/2009-July/024831.html
Description: Fixes function conflicts with Glibc.

diff -Naur tetex-src-3.0-orig/texk/dvipsk/afm2tfm.c 
tetex-src-3.0/texk/dvipsk/afm2tfm.c
--- tetex-src-3.0-orig/texk/dvipsk/afm2tfm.c    2009-08-07 13:49:35.579146458 
+0100
+++ tetex-src-3.0/texk/dvipsk/afm2tfm.c 2009-08-07 13:51:26.599146404 +0100
@@ -257,7 +257,7 @@
 }
 
 int
-getline P1H(void) {
+afm_getline P1H(void) {
    register char *p ;
    register int c ;
 
@@ -606,7 +606,7 @@
    ai = newchar() ;
    ai->adobenum = -1 ;
    ai->adobename = "||" ; /* boundary character name */
-   while (getline()) {
+   while (afm_getline()) {
       switch(interest(paramstring())) {
 case FontName:
          fontname = paramnewstring() ;
@@ -1882,7 +1882,7 @@
 
    while (1) {
       while (param == 0 || *param == 0) {
-         if (getline() == 0)
+         if (afm_getline() == 0)
             error("! premature end in encoding file") ;
          for (p=buffer; *p; p++)
             if (*p == '%') {
@@ -1973,7 +1973,7 @@
       p = gettoken() ;
       if (strcmp(p, "]"))
          error("! token 258 in encoding must be make-array (])") ;
-      while (getline()) {
+      while (afm_getline()) {
          for (p=buffer; *p; p++)
             if (*p == '%') {
                if (ignoreligkern == 0)
diff -Naur tetex-src-3.0-orig/texk/web2c/cpascal.h 
tetex-src-3.0/texk/web2c/cpascal.h
--- tetex-src-3.0-orig/texk/web2c/cpascal.h     2009-08-07 13:49:35.580142559 
+0100
+++ tetex-src-3.0/texk/web2c/cpascal.h  2009-08-07 13:50:34.401146251 +0100
@@ -240,7 +240,12 @@
 #undef getname
 #define getname vms_getname
 #endif
-
+
+#ifdef getline
+#undef getline
+#endif
+#define getline tex_getline
+
 /* Declarations for the routines we provide ourselves in lib/.  */
 
 extern string basenamechangesuffix P3H(const_string,const_string,const_string);

pgpfUXdfa8Wr5.pgp
Description: PGP signature

-- 
http://linuxfromscratch.org/mailman/listinfo/blfs-dev
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page