diff -ru calc-2.11.10.1/Makefile calc-2.11.10.1-ml/Makefile --- calc-2.11.10.1/Makefile 2004-07-29 07:18:56.000000000 +0200 +++ calc-2.11.10.1-ml/Makefile 2006-04-21 11:02:25.000000000 +0200 @@ -670,7 +670,7 @@ # # If in doubt, use T= # -T= +T=/tmp/calc # where man pages are installed # @@ -999,8 +999,8 @@ CCOPT= ${DEBUG} ${NO_SHARED} CCMISC= # -CFLAGS= -DCALC_SRC ${CCWARN} ${CCOPT} ${CCMISC} -ICFLAGS= -DCALC_SRC ${CCWARN} ${CCMISC} +CFLAGS= -arch ppc -arch i386 -DHAVE_SNPRINTF -DCALC_SRC ${CCWARN} ${CCOPT} ${CCMISC} +ICFLAGS= -arch ppc -arch i386 -DCALC_SRC ${CCWARN} ${CCMISC} # LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED} ILDFLAGS= diff -ru calc-2.11.10.1/math_error.c calc-2.11.10.1-ml/math_error.c --- calc-2.11.10.1/math_error.c 2001-03-17 22:55:52.000000000 +0100 +++ calc-2.11.10.1-ml/math_error.c 2006-04-21 11:01:54.000000000 +0200 @@ -76,7 +76,7 @@ */ jmp_buf calc_jmp_buf; int calc_jmp = 0; /* non-zero => use calc_jmp_buf */ -char calc_error[MAXERROR+1]; /* last calc error message */ +//char calc_error[MAXERROR+1]; /* last calc error message */ /* diff -ru calc-2.11.10.1/math_error.h calc-2.11.10.1-ml/math_error.h --- calc-2.11.10.1/math_error.h 2001-06-08 23:00:58.000000000 +0200 +++ calc-2.11.10.1-ml/math_error.h 2006-04-21 11:01:54.000000000 +0200 @@ -43,6 +43,8 @@ /* * Global data definitions. */ +char calc_error[MAXERROR+1]; /* last calc error message */ + extern DLL jmp_buf jmpbuf; /* for errors */ diff -ru calc-2.11.10.1/token.c calc-2.11.10.1-ml/token.c --- calc-2.11.10.1/token.c 2001-03-17 22:55:52.000000000 +0100 +++ calc-2.11.10.1-ml/token.c 2006-04-21 11:01:54.000000000 +0200 @@ -702,6 +702,8 @@ } +//extern char *calc_error; + /* * Describe an error message. * Then skip to the next specified token (or one more powerful). @@ -722,8 +724,9 @@ fprintf(stderr, "\"%s\", line %ld: ", name, linenumber()); va_start(ap, fmt); vsprintf(buf, fmt, ap); + vsprintf(calc_error, fmt, ap); va_end(ap); - fprintf(stderr, "%s\n", buf); +// fprintf(stderr, "%s\n", buf); /* bail out if continuation not permitted */ if ((!c_flag && !stoponerror) || stoponerror > 0)