Bug 615361 warning: cast from pointer to integer of different size in jsd

r=bz

--HG--
extra : rebase_source : 6f2dc7c2ba4b0367a8723bae01ce3797d193ff0d

js/jsd/jsd_atom.c

@@ -103,7 +103,7 @@ jsd_CreateAtomTable(JSDContext* jsdc)
 #ifdef TEST_ATOMS
     _testAtoms(jsdc);
 #endif    
-    return (JSBool) jsdc->atoms;
+    return !!jsdc->atoms;
 }
 
 void

js/jsd/jsd_obj.c

@@ -172,7 +172,7 @@ jsd_Constructing(JSDContext* jsdc, JSContext *cx, JSObject *obj,
 static JSHashNumber
 _hash_root(const void *key)
 {
-    return ((JSHashNumber) key) >> 2; /* help lame MSVC1.5 on Win16 */
+    return ((JSHashNumber)(ptrdiff_t) key) >> 2; /* help lame MSVC1.5 on Win16 */
 }
 
 JSBool
@@ -182,7 +182,7 @@ jsd_InitObjectManager(JSDContext* jsdc)
     jsdc->objectsTable = JS_NewHashTable(256, _hash_root,
                                          JS_CompareValues, JS_CompareValues,
                                          NULL, NULL);
-    return (JSBool) jsdc->objectsTable;
+    return !!jsdc->objectsTable;
 }
 
 void

js/jsd/jsd_scpt.c

@@ -232,7 +232,7 @@ _dumpJSDScriptList( JSDContext* jsdc )
 static JSHashNumber
 jsd_hash_script(const void *key)
 {
-    return ((JSHashNumber) key) >> 2; /* help lame MSVC1.5 on Win16 */
+    return ((JSHashNumber)(ptrdiff_t) key) >> 2; /* help lame MSVC1.5 on Win16 */
 }
 
 static void *
@@ -279,7 +279,7 @@ jsd_InitScriptManager(JSDContext* jsdc)
     jsdc->scriptsTable = JS_NewHashTable(JSD_SCRIPT_HASH_SIZE, jsd_hash_script,
                                          JS_CompareValues, JS_CompareValues,
                                          &script_alloc_ops, (void*) jsdc);
-    return (JSBool) jsdc->scriptsTable;
+    return !!jsdc->scriptsTable;
 }
 
 void