Bug 428128 - Removal of legacy JSLL_ routines, r=brendan, a=mtschrep

js/jsd/jsd_step.c

@@ -176,10 +176,10 @@ _callHook(JSDContext *jsdc, JSContext *cx, JSStackFrame *fp, JSBool before,
                             /* We're the new current function, and no return
                              * has happened yet. */
                             jsdc->callingFunctionPData = pdata;
-                            jsdc->lastReturnTime = JSLL_ZERO;
+                            jsdc->lastReturnTime = 0;
                             /* This function has no running time (just been
                              * called!), and we'll need the call start time. */
-                            pdata->runningTime = JSLL_ZERO;
+                            pdata->runningTime = 0;
                             pdata->lastCallStart = now;
                         } else {
                             if (++pdata->recurseDepth > pdata->maxRecurseDepth)
@@ -238,7 +238,7 @@ _callHook(JSDContext *jsdc, JSContext *cx, JSStackFrame *fp, JSBool before,
                         /* Mark the time we returned, and indicate this
                          * function is no longer running. */
                         jsdc->lastReturnTime = now;
-                        pdata->lastCallStart = JSLL_ZERO;
+                        pdata->lastCallStart = 0;
                         ++pdata->callCount;
                     } else if (pdata->recurseDepth) {
                         --pdata->recurseDepth;

js/src/jslong.c

@@ -40,23 +40,6 @@
 #include "jstypes.h"
 #include "jslong.h"
 
-static JSInt64 ll_zero = JSLL_INIT( 0x00000000,0x00000000 );
-static JSInt64 ll_maxint = JSLL_INIT( 0x7fffffff, 0xffffffff );
-static JSInt64 ll_minint = JSLL_INIT( 0x80000000, 0x00000000 );
-
-#ifdef HAVE_WATCOM_BUG_2
-JSInt64 __pascal __loadds __export
-    JSLL_Zero(void) { return ll_zero; }
-JSInt64 __pascal __loadds __export
-    JSLL_MaxInt(void) { return ll_maxint; }
-JSInt64 __pascal __loadds __export
-    JSLL_MinInt(void) { return ll_minint; }
-#else
-JS_PUBLIC_API(JSInt64) JSLL_Zero(void) { return ll_zero; }
-JS_PUBLIC_API(JSInt64) JSLL_MaxInt(void) { return ll_maxint; }
-JS_PUBLIC_API(JSInt64) JSLL_MinInt(void) { return ll_minint; }
-#endif
-
 #ifndef JS_HAVE_LONG_LONG
 /*
 ** Divide 64-bit a by 32-bit b, which must be normalized so its high bit is 1.

js/src/jslong.h

@@ -51,31 +51,6 @@
 
 JS_BEGIN_EXTERN_C
 
-/***********************************************************************
-** DEFINES:     JSLL_MaxInt
-**              JSLL_MinInt
-**              JSLL_Zero
-** DESCRIPTION:
-**      Various interesting constants and static variable
-**      initializer
-***********************************************************************/
-#ifdef HAVE_WATCOM_BUG_2
-JSInt64 __pascal __loadds __export
-    JSLL_MaxInt(void);
-JSInt64 __pascal __loadds __export
-    JSLL_MinInt(void);
-JSInt64 __pascal __loadds __export
-    JSLL_Zero(void);
-#else
-extern JS_PUBLIC_API(JSInt64) JSLL_MaxInt(void);
-extern JS_PUBLIC_API(JSInt64) JSLL_MinInt(void);
-extern JS_PUBLIC_API(JSInt64) JSLL_Zero(void);
-#endif
-
-#define JSLL_MAXINT   JSLL_MaxInt()
-#define JSLL_MININT   JSLL_MinInt()
-#define JSLL_ZERO     JSLL_Zero()
-
 #ifdef JS_HAVE_LONG_LONG
 
 #if JS_BYTES_PER_LONG == 8

js/src/prmjtime.c

@@ -537,7 +537,7 @@ PRMJ_DSTOffset(JSInt64 local_time)
 #ifndef HAVE_LOCALTIME_R
     ptm = localtime(&local);
     if(!ptm){
-        return JSLL_ZERO;
+        return 0;
     }
     tm = *ptm;
 #else