[tex-k] Another bug

Julian Gilbey J.D.Gilbey@qmw.ac.uk
Thu, 25 Jan 2001 14:36:35 +0000


I'm trying to compile Metafont with the original makefraction
etc. routines, and discovered that the preprocessor directives in
web2c/lib/texmfmp.c are in the wrong places.  Here is a patch, which
only includes the assembler versions if FIXPT is not defined:

--- texmfmp.c.orig	Thu Jan 25 14:32:26 2001
+++ texmfmp.c	Thu Jan 25 14:33:52 2001
@@ -1347,6 +1347,7 @@
 /* Metafont/MetaPost fraction routines. Replaced either by assembler or C.
    The assembler syntax doesn't work on Solaris/x86.  */
 #ifndef TeX
+#ifndef FIXPT
 #ifdef __sun__
 #define NO_MF_ASM
 #endif
@@ -1384,8 +1385,6 @@
  The following is by John Hobby
  **********************************************************/
 
-#ifndef FIXPT
-
 /* These replacements for takefraction, makefraction, takescaled, makescaled
    run about 3 to 11 times faster than the standard versions on modern machines
    that have fast hardware for double-precision floating point.  They should
@@ -1525,8 +1524,8 @@
 	return i;
 }
 
-#endif /* not FIXPT */
 #endif /* not assembler */
+#endif /* not FIXPT */
 #endif /* not TeX, i.e., MF or MP */
 
 #ifdef MF


   Julian

-- 
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-

         Julian Gilbey, Dept of Maths, Queen Mary, Univ. of London
       Debian GNU/Linux Developer,  see http://people.debian.org/~jdg
  Donate free food to the world's hungry: see http://www.thehungersite.com/