diff -up kdelibs-3.5.10/kjs/dtoa.cpp.orig kdelibs-3.5.10/kjs/dtoa.cpp

--- kdelibs-3.5.10/kjs/dtoa.cpp.orig	2009-12-09 18:32:22.000000000 +0100

+++ kdelibs-3.5.10/kjs/dtoa.cpp	2009-12-09 18:32:36.000000000 +0100

@@ -174,9 +174,10 @@

 #undef CONST

 #endif

+#include "dtoa.h"

 #include <config.h>

-#include "stdlib.h"

+#include "global.h"

 #ifdef WORDS_BIGENDIAN

 #define IEEE_MC68k

@@ -184,7 +185,6 @@

 #define IEEE_8087

 #endif

 #define INFNAN_CHECK

-#include "dtoa.h"

@@ -196,22 +196,19 @@ typedef unsigned Long ULong;

 #endif

 #ifdef DEBUG

-#include "stdio.h"

+#include <stdio.h>

 #define Bug(x) {fprintf(stderr, "%s\n", x); exit(1);}

 #endif

-#include "string.h"

+#include <stdlib.h>

+#include <string.h>

 #ifdef USE_LOCALE

-#include "locale.h"

+#include <locale.h>

 #endif

 #ifdef MALLOC

-#ifdef KR_headers

-extern char *MALLOC();

-#else

 extern void *MALLOC(size_t);

-#endif

 #else

 #define MALLOC malloc

 #endif

@@ -233,7 +230,7 @@ static double private_mem[PRIVATE_mem], 

 #define IEEE_Arith

 #endif

-#include "errno.h"

+#include <errno.h>

 #ifdef Bad_float_h

@@ -260,25 +257,29 @@ static double private_mem[PRIVATE_mem], 

 #define DBL_MAX 1.7014118346046923e+38

 #endif

+#ifndef LONG_MAX

+#define LONG_MAX 2147483647

+#endif

+

 #else /* ifndef Bad_float_h */

-#include "float.h"

+#include <float.h>

 #endif /* Bad_float_h */

 #ifndef __MATH_H__

-#include "math.h"

+#include <math.h>

 #endif

+#define strtod kjs_strtod

+#define dtoa kjs_dtoa

+#define freedtoa kjs_freedtoa

+

 #ifdef __cplusplus

 extern "C" {

 #endif

 #ifndef CONST

-#ifdef KR_headers

-#define CONST /* blank */

-#else

 #define CONST const

 #endif

-#endif

 #if defined(IEEE_8087) + defined(IEEE_MC68k) + defined(VAX) + defined(IBM) != 1

 Exactly one of IEEE_8087, IEEE_MC68k, VAX, or IBM should be defined.

@@ -286,37 +287,19 @@ Exactly one of IEEE_8087, IEEE_MC68k, VA

 typedef union { double d; ULong L[2]; } U;

-#ifdef YES_ALIAS

-#define dval(x) x

+#define dval(x) (x).d

 #ifdef IEEE_8087

-#define word0(x) ((ULong *)&x)[1]

-#define word1(x) ((ULong *)&x)[0]

+#define word0(x) (x).L[1]

+#define word1(x) (x).L[0]

 #else

-#define word0(x) ((ULong *)&x)[0]

-#define word1(x) ((ULong *)&x)[1]

-#endif

-#else

-#ifdef IEEE_8087

-#define word0(x) ((U*)&x)->L[1]

-#define word1(x) ((U*)&x)->L[0]

-#else

-#define word0(x) ((U*)&x)->L[0]

-#define word1(x) ((U*)&x)->L[1]

-#endif

-#define dval(x) ((U*)&x)->d

+#define word0(x) (x).L[0]

+#define word1(x) (x).L[1]

 #endif

 /* The following definition of Storeinc is appropriate for MIPS processors.

  * An alternative that might be better on some machines is

- * #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)

  */

-#if defined(IEEE_8087) + defined(VAX)

-#define Storeinc(a,b,c) (((unsigned short *)a)[1] = (unsigned short)b, \

-((unsigned short *)a)[0] = (unsigned short)c, a++)

-#else

-#define Storeinc(a,b,c) (((unsigned short *)a)[0] = (unsigned short)b, \

-((unsigned short *)a)[1] = (unsigned short)c, a++)

-#endif

+#define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)

 /* #define P DBL_MANT_DIG */

 /* Ten_pmax = floor(P*log(2)/log(5)) */

@@ -440,11 +423,7 @@ typedef union { double d; ULong L[2]; } 

 #ifdef RND_PRODQUOT

 #define rounded_product(a,b) a = rnd_prod(a, b)

 #define rounded_quotient(a,b) a = rnd_quot(a, b)

-#ifdef KR_headers

-extern double rnd_prod(), rnd_quot();

-#else

 extern double rnd_prod(double, double), rnd_quot(double, double);

-#endif

 #else

 #define rounded_product(a,b) a *= b

 #define rounded_quotient(a,b) a /= b

@@ -457,11 +436,7 @@ extern double rnd_prod(double, double), 

 #define Pack_32

 #endif

-#ifdef KR_headers

-#define FFFFFFFF ((((unsigned long)0xffff)<<16)|(unsigned long)0xffff)

-#else

 #define FFFFFFFF 0xffffffffUL

-#endif

 #ifdef NO_LONG_LONG

 #undef ULLong

@@ -487,7 +462,7 @@ extern double rnd_prod(double, double), 

 #define FREE_DTOA_LOCK(n)	/*nothing*/

 #endif

-#define Kmax 15

+#define Kmax (sizeof(size_t) << 3)

  struct

 Bigint {

@@ -502,11 +477,7 @@ Bigint {

  static Bigint *

 Balloc

-#ifdef KR_headers

-	(k) int k;

-#else

 	(int k)

-#endif

 {

 	int x;

 	Bigint *rv;

@@ -525,7 +496,7 @@ Balloc

 #else

 		len = (sizeof(Bigint) + (x-1)*sizeof(ULong) + sizeof(double) - 1)

 			/sizeof(double);

-		if (pmem_next - private_mem + len <= PRIVATE_mem) {

+		if (pmem_next - private_mem + len <= (unsigned)PRIVATE_mem) {

 			rv = (Bigint*)pmem_next;

 			pmem_next += len;

 			}

@@ -542,11 +513,7 @@ Balloc

  static void

 Bfree

-#ifdef KR_headers

-	(v) Bigint *v;

-#else

 	(Bigint *v)

-#endif

 {

 	if (v) {

 		ACQUIRE_DTOA_LOCK(0);

@@ -561,11 +528,7 @@ y->wds*sizeof(Long) + 2*sizeof(int))

  static Bigint *

 multadd

-#ifdef KR_headers

-	(b, m, a) Bigint *b; int m, a;

-#else

 	(Bigint *b, int m, int a)	/* multiply by m and add a */

-#endif

 {

 	int i, wds;

 #ifdef ULLong

@@ -587,7 +550,7 @@ multadd

 #ifdef ULLong

 		y = *x * (ULLong)m + carry;

 		carry = y >> 32;

-		*x++ = y & FFFFFFFF;

+		*x++ = (ULong)y & FFFFFFFF;

 #else

 #ifdef Pack_32

 		xi = *x;

@@ -610,7 +573,7 @@ multadd

 			Bfree(b);

 			b = b1;

 			}

-		b->x[wds++] = carry;

+		b->x[wds++] = (ULong)carry;

 		b->wds = wds;

 		}

 	return b;

@@ -618,11 +581,7 @@ multadd

  static Bigint *

 s2b

-#ifdef KR_headers

-	(s, nd0, nd, y9) CONST char *s; int nd0, nd; ULong y9;

-#else

 	(CONST char *s, int nd0, int nd, ULong y9)

-#endif

 {

 	Bigint *b;

 	int i, k;

@@ -656,11 +615,7 @@ s2b

  static int

 hi0bits

-#ifdef KR_headers

-	(x) register ULong x;

-#else

 	(register ULong x)

-#endif

 {

 	register int k = 0;

@@ -690,11 +645,7 @@ hi0bits

  static int

 lo0bits

-#ifdef KR_headers

-	(y) ULong *y;

-#else

 	(ULong *y)

-#endif

 {

 	register int k;

 	register ULong x = *y;

@@ -738,11 +689,7 @@ lo0bits

  static Bigint *

 i2b

-#ifdef KR_headers

-	(i) int i;

-#else

 	(int i)

-#endif

 {

 	Bigint *b;

@@ -754,11 +701,7 @@ i2b

  static Bigint *

 mult

-#ifdef KR_headers

-	(a, b) Bigint *a, *b;

-#else

 	(Bigint *a, Bigint *b)

-#endif

 {

 	Bigint *c;

 	int k, wa, wb, wc;

@@ -801,10 +744,10 @@ mult

 			do {

 				z = *x++ * (ULLong)y + *xc + carry;

 				carry = z >> 32;

-				*xc++ = z & FFFFFFFF;

+				*xc++ = (ULong)z & FFFFFFFF;

 				}

 				while(x < xae);

-			*xc = carry;

+			*xc = (ULong)carry;

 			}

 		}

 #else

@@ -866,11 +809,7 @@ mult

  static Bigint *

 pow5mult

-#ifdef KR_headers

-	(b, k) Bigint *b; int k;

-#else

 	(Bigint *b, int k)

-#endif

 {

 	Bigint *b1, *p5, *p51;

 	int i;

@@ -923,11 +862,7 @@ pow5mult

  static Bigint *

 lshift

-#ifdef KR_headers

-	(b, k) Bigint *b; int k;

-#else

 	(Bigint *b, int k)

-#endif

 {

 	int i, k1, n, n1;

 	Bigint *b1;

@@ -983,11 +918,7 @@ lshift

  static int

 cmp

-#ifdef KR_headers

-	(a, b) Bigint *a, *b;

-#else

 	(Bigint *a, Bigint *b)

-#endif

 {

 	ULong *xa, *xa0, *xb, *xb0;

 	int i, j;

@@ -1017,11 +948,7 @@ cmp

  static Bigint *

 diff

-#ifdef KR_headers

-	(a, b) Bigint *a, *b;

-#else

 	(Bigint *a, Bigint *b)

-#endif

 {

 	Bigint *c;

 	int i, wa, wb;

@@ -1064,13 +991,13 @@ diff

 	do {

 		y = (ULLong)*xa++ - *xb++ - borrow;

 		borrow = y >> 32 & (ULong)1;

-		*xc++ = y & FFFFFFFF;

+		*xc++ = (ULong)y & FFFFFFFF;

 		}

 		while(xb < xbe);

 	while(xa < xae) {

 		y = *xa++ - borrow;

 		borrow = y >> 32 & (ULong)1;

-		*xc++ = y & FFFFFFFF;

+		*xc++ = (ULong)y & FFFFFFFF;

 		}

 #else

 #ifdef Pack_32

@@ -1111,15 +1038,12 @@ diff

  static double

 ulp

-#ifdef KR_headers

-	(x) double x;

-#else

-	(double x)

-#endif

+	(double dx)

 {

 	register Long L;

-	double a;

+	U x, a;

+	dval(x) = dx;

 	L = (word0(x) & Exp_mask) - (P-1)*Exp_msk1;

 #ifndef Avoid_Underflow

 #ifndef Sudden_Underflow

@@ -1153,15 +1077,11 @@ ulp

  static double

 b2d

-#ifdef KR_headers

-	(a, e) Bigint *a; int *e;

-#else

 	(Bigint *a, int *e)

-#endif

 {

 	ULong *xa, *xa0, w, y, z;

 	int k;

-	double d;

+	U d;

 #ifdef VAX

 	ULong d0, d1;

 #else

@@ -1223,12 +1143,9 @@ b2d

  static Bigint *

 d2b

-#ifdef KR_headers

-	(d, e, bits) double d; int *e, *bits;

-#else

-	(double d, int *e, int *bits)

-#endif

+	(double dd, int *e, int *bits)

 {

+	U d;

 	Bigint *b;

 	int de, k;

 	ULong *x, y, z;

@@ -1237,6 +1154,9 @@ d2b

 #endif

 #ifdef VAX

 	ULong d0, d1;

+#endif

+	dval(d) = dd;

+#ifdef VAX

 	d0 = word0(d) >> 16 | word0(d) << 16;

 	d1 = word1(d) >> 16 | word1(d) << 16;

 #else

@@ -1361,13 +1281,9 @@ d2b

  static double

 ratio

-#ifdef KR_headers

-	(a, b) Bigint *a, *b;

-#else

 	(Bigint *a, Bigint *b)

-#endif

 {

-	double da, db;

+	U da, db;

 	int k, ka, kb;

 	dval(da) = b2d(a, &ka);

@@ -1453,11 +1369,7 @@ static CONST double tinytens[] = { 1e-16

  static int

 match

-#ifdef KR_headers

-	(sp, t) char **sp, *t;

-#else

 	(CONST char **sp, CONST char *t)

-#endif

 {

 	int c, d;

 	CONST char *s = *sp;

@@ -1475,11 +1387,7 @@ match

 #ifndef No_Hex_NaN

  static void

 hexnan

-#ifdef KR_headers

-	(rvp, sp) double *rvp; CONST char **sp;

-#else

-	(double *rvp, CONST char **sp)

-#endif

+	(U *rvp, CONST char **sp)

 {

 	ULong c, x[2];

 	CONST char *s;

@@ -1528,12 +1436,8 @@ hexnan

 #endif /* INFNAN_CHECK */

  double

-kjs_strtod

-#ifdef KR_headers

-	(s00, se) CONST char *s00; char **se;

-#else

+strtod

 	(CONST char *s00, char **se)

-#endif

 {

 #ifdef Avoid_Underflow

 	int scale;

@@ -1541,7 +1445,8 @@ kjs_strtod

 	int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign,

 		 e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign;

 	CONST char *s, *s0, *s1;

-	double aadj, aadj1, adj, rv, rv0;

+	double aadj, aadj1, adj;

+	U aadj2, rv, rv0;

 	Long L;

 	ULong y, z;

 	Bigint *bb = NULL, *bb1 = NULL, *bd = NULL, *bd0 = NULL, *bs = NULL, *delta = NULL;

@@ -2302,7 +2207,9 @@ kjs_strtod

 					aadj = z;

 					aadj1 = dsign ? aadj : -aadj;

 					}

-				word0(aadj1) += (2*P+1)*Exp_msk1 - y;

+				dval(aadj2) = aadj1;

+				word0(aadj2) += (2*P+1)*Exp_msk1 - y;

+				aadj1 = dval(aadj2);

 				}

 			adj = aadj1 * ulp(dval(rv));

 			dval(rv) += adj;

@@ -2419,11 +2326,7 @@ kjs_strtod

  static int

 quorem

-#ifdef KR_headers

-	(b, S) Bigint *b, *S;

-#else

 	(Bigint *b, Bigint *S)

-#endif

 {

 	int n;

 	ULong *bx, *bxe, q, *sx, *sxe;

@@ -2461,7 +2364,7 @@ quorem

 			carry = ys >> 32;

 			y = *bx - (ys & FFFFFFFF) - borrow;

 			borrow = y >> 32 & (ULong)1;

-			*bx++ = y & FFFFFFFF;

+			*bx++ = (ULong)y & FFFFFFFF;

 #else

 #ifdef Pack_32

 			si = *sx++;

@@ -2502,7 +2405,7 @@ quorem

 			carry = ys >> 32;

 			y = *bx - (ys & FFFFFFFF) - borrow;

 			borrow = y >> 32 & (ULong)1;

-			*bx++ = y & FFFFFFFF;

+			*bx++ = (ULong)y & FFFFFFFF;

 #else

 #ifdef Pack_32

 			si = *sx++;

@@ -2540,11 +2443,7 @@ quorem

 #endif

  static char *

-#ifdef KR_headers

-rv_alloc(i) int i;

-#else

 rv_alloc(int i)

-#endif

 {

 	int j, k, *r;

@@ -2563,11 +2462,7 @@ rv_alloc(int i)

 	}

  static char *

-#ifdef KR_headers

-nrv_alloc(s, rve, n) char *s, **rve; int n;

-#else

 nrv_alloc(CONST char *s, char **rve, int n)

-#endif

 {

 	char *rv, *t;

@@ -2585,11 +2480,7 @@ nrv_alloc(CONST char *s, char **rve, int

  */

  void

-#ifdef KR_headers

-kjs_freedtoa(s) char *s;

-#else

-kjs_freedtoa(char *s)

-#endif

+freedtoa(char *s)

 {

 	Bigint *b = (Bigint *)((int *)s - 1);

 	b->maxwds = 1 << (b->k = *(int*)b);

@@ -2635,13 +2526,8 @@ kjs_freedtoa(char *s)

  */

  char *

-kjs_dtoa

-#ifdef KR_headers

-	(d, mode, ndigits, decpt, sign, rve)

-	double d; int mode, ndigits, *decpt, *sign; char **rve;

-#else

-	(double d, int mode, int ndigits, int *decpt, int *sign, char **rve)

-#endif

+dtoa

+	(double dd, int mode, int ndigits, int *decpt, int *sign, char **rve)

 {

  /*	Arguments ndigits, decpt, sign are similar to those

 	of ecvt and fcvt; trailing zeros are suppressed from

@@ -2686,7 +2572,8 @@ kjs_dtoa

 	ULong x;

 #endif

 	Bigint *b, *b1, *delta, *mlo = NULL, *mhi, *S;

-	double d2, ds, eps;

+	U d, d2, eps;

+	double ds;

 	char *s, *s0;

 #ifdef Honor_FLT_ROUNDS

 	int rounding;

@@ -2697,11 +2584,12 @@ kjs_dtoa

 #ifndef MULTIPLE_THREADS

 	if (dtoa_result) {

-		kjs_freedtoa(dtoa_result);

+		freedtoa(dtoa_result);

 		dtoa_result = 0;

 		}

 #endif

+	dval(d) = dd;

 	if (word0(d) & Sign_bit) {

 		/* set sign for everything, including 0's and NaNs */

 		*sign = 1;

@@ -2966,7 +2854,8 @@ kjs_dtoa

 					if (dval(d) > 0.5 + dval(eps))

 						goto bump_up;

 					else if (dval(d) < 0.5 - dval(eps)) {

-						while(*--s == '0');

+						while(*--s == '0')

+							;

 						s++;

 						goto ret1;

 						}

@@ -3285,7 +3174,8 @@ kjs_dtoa

 #ifdef Honor_FLT_ROUNDS

 trimzeros:

 #endif

-		while(*--s == '0');

+		while(*--s == '0')

+			;

 		s++;

 		}

  ret: