From 0c95aa4b86de3ca18898c161d97eee8526850c09 Mon Sep 17 00:00:00 2001 From: ceriel Date: Fri, 23 Feb 1990 17:02:06 +0000 Subject: [PATCH] fixed library order : fix for 2-byte machines --- modules/src/flt_arith/Makefile | 15 ++++++++------- modules/src/flt_arith/flt_ar2flt.c | 2 +- modules/src/flt_arith/flt_div.c | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/modules/src/flt_arith/Makefile b/modules/src/flt_arith/Makefile index b49f02a4b..cef5f6043 100644 --- a/modules/src/flt_arith/Makefile +++ b/modules/src/flt_arith/Makefile @@ -11,13 +11,14 @@ LIBSUF = a LIBFLT = libflt.$(LIBSUF) -SRC = b64_add.c flt_ar2flt.c flt_div.c flt_nrm.c b64_sft.c flt_chk.c \ - flt_flt2ar.c flt_str2fl.c flt_add.c flt_cmp.c flt_mul.c ucmp.c \ - flt_modf.c flt_umin.c split.c -OBJ = b64_add.$(SUF) flt_ar2flt.$(SUF) flt_div.$(SUF) flt_nrm.$(SUF) \ - b64_sft.$(SUF) flt_chk.$(SUF) flt_flt2ar.$(SUF) flt_str2fl.$(SUF) \ - flt_add.$(SUF) flt_cmp.$(SUF) flt_mul.$(SUF) ucmp.$(SUF) \ - flt_modf.$(SUF) flt_umin.$(SUF) split.$(SUF) +SRC = flt_ar2flt.c flt_div.c flt_flt2ar.c flt_modf.c flt_str2fl.c \ + flt_cmp.c flt_add.c b64_add.c flt_mul.c flt_nrm.c b64_sft.c \ + flt_umin.c flt_chk.c split.c ucmp.c + +OBJ = flt_ar2flt.$(SUF) flt_div.$(SUF) flt_flt2ar.$(SUF) flt_modf.$(SUF) \ + flt_str2fl.$(SUF) flt_cmp.$(SUF) flt_add.$(SUF) b64_add.$(SUF) \ + flt_mul.$(SUF) flt_nrm.$(SUF) b64_sft.$(SUF) flt_umin.$(SUF) \ + flt_chk.$(SUF) split.$(SUF) ucmp.$(SUF) .SUFFIXES: .$(SUF) .c.$(SUF): diff --git a/modules/src/flt_arith/flt_ar2flt.c b/modules/src/flt_arith/flt_ar2flt.c index 505f55e01..af8e26c18 100644 --- a/modules/src/flt_arith/flt_ar2flt.c +++ b/modules/src/flt_arith/flt_ar2flt.c @@ -31,7 +31,7 @@ flt_arith2flt(n, e, uns) for (i = 64; i > 0 && n != 0; i--) { flt_b64_sft(&(e->flt_mantissa),1); e->m1 |= (n & 1) << 31; - n = (n >> 1) & ~(0x80 << 8*(sizeof(arith)-1)); + n = (n >> 1) & ~(0x80L << 8*(sizeof(arith)-1)); } if (i > 0) { diff --git a/modules/src/flt_arith/flt_div.c b/modules/src/flt_arith/flt_div.c index 9ec1f483d..52e8435ed 100644 --- a/modules/src/flt_arith/flt_div.c +++ b/modules/src/flt_arith/flt_div.c @@ -57,7 +57,7 @@ flt_div(e1,e2,e3) if (u_p[0] == 0 && u_p[1] < v[1]) continue; temp = ((long)u_p[0] << 16) + u_p[1]; if (u_p[0] >= v[1]) { - q_est = 0x0000FFFF; + q_est = 0x0000FFFFL; } else if (v[1] == 1) { q_est = temp;