diff --git a/js/jsd/jsd_step.c b/js/jsd/jsd_step.c index 4048e076faa..e2054637128 100644 --- a/js/jsd/jsd_step.c +++ b/js/jsd/jsd_step.c @@ -190,7 +190,7 @@ _callHook(JSDContext *jsdc, JSContext *cx, JSStackFrame *fp, JSBool before, jsdouble delta; now = JS_Now(); ll_delta = now - pdata->lastCallStart; - delta = (JSFloat64) ll_delta; + delta = ll_delta; delta /= 1000.0; pdata->totalExecutionTime += delta; /* minExecutionTime starts as 0, so we need to overwrite @@ -214,7 +214,7 @@ _callHook(JSDContext *jsdc, JSContext *cx, JSStackFrame *fp, JSBool before, * running time as 'delta'. */ ll_delta = now - jsdc->lastReturnTime; pdata->runningTime += ll_delta; - delta = (JSFloat64) pdata->runningTime; + delta = pdata->runningTime; delta /= 1000.0; } diff --git a/js/src/jscompat.h b/js/src/jscompat.h index 903a96e0aa5..b1e5159cc5f 100644 --- a/js/src/jscompat.h +++ b/js/src/jscompat.h @@ -50,5 +50,4 @@ typedef JSIntn intN; typedef JSUintn uintN; typedef JSUword jsuword; typedef JSWord jsword; -typedef float float32; #endif /* jscompat_h___ */ diff --git a/js/src/jsotypes.h b/js/src/jsotypes.h index 212c67fc8bb..b185166dfd4 100644 --- a/js/src/jsotypes.h +++ b/js/src/jsotypes.h @@ -93,6 +93,4 @@ typedef JSInt16 int16; typedef JSInt8 int8; #endif /* AIX && HAVE_SYS_INTTYPES_H */ -typedef JSFloat64 float64; - #endif /* !defined(PROTYPES_H) */ diff --git a/js/src/jspubtd.h b/js/src/jspubtd.h index f87d0e6cf49..d831b403241 100644 --- a/js/src/jspubtd.h +++ b/js/src/jspubtd.h @@ -96,7 +96,7 @@ JS_BEGIN_EXTERN_C /* Scalar typedefs. */ typedef JSInt32 jsint; typedef JSUint32 jsuint; -typedef float64 jsdouble; +typedef double jsdouble; typedef JSInt32 jsrefcount; /* PRInt32 if JS_THREADSAFE, see jslock.h */ #ifdef WIN32 diff --git a/js/src/jstypes.h b/js/src/jstypes.h index 51571604c04..2906a751234 100644 --- a/js/src/jstypes.h +++ b/js/src/jstypes.h @@ -340,13 +340,6 @@ JS_BEGIN_EXTERN_C typedef int JSIntn; typedef unsigned int JSUintn; -/************************************************************************ -** TYPES: JSFloat64 -** DESCRIPTION: -** NSPR's floating point type is always 64 bits. -************************************************************************/ -typedef double JSFloat64; - /************************************************************************ ** TYPES: JSSize ** DESCRIPTION: