Bug 925807 - define JS_BITS_PER_WORD in terms of JS_64BIT; r=njn

js/public/Value.h

@@ -15,6 +15,8 @@
 
 #include <limits> /* for std::numeric_limits */
 
+#include "jstypes.h"
+
 #include "js/Anchor.h"
 #include "js/RootingAPI.h"
 #include "js/Utility.h"

js/src/gc/RootMarking.cpp

@@ -15,6 +15,7 @@
 #include "jsgc.h"
 #include "jsonparser.h"
 #include "jsprf.h"
+#include "jstypes.h"
 #include "jswatchpoint.h"
 
 #include "builtin/MapObject.h"

js/src/jit/IonCode.h

@@ -11,6 +11,7 @@
 #include "mozilla/PodOperations.h"
 
 #include "jsinfer.h"
+#include "jstypes.h"
 
 #include "gc/Heap.h"
 #include "jit/IonTypes.h"

js/src/jit/StupidAllocator.cpp

@@ -6,6 +6,8 @@
 
 #include "jit/StupidAllocator.h"
 
+#include "jstypes.h"
+
 using namespace js;
 using namespace js::jit;
 

js/src/jsfun.h

@@ -13,6 +13,7 @@
 
 #include "jsobj.h"
 #include "jsscript.h"
+#include "jstypes.h"
 
 namespace js {
 class FunctionExtended;

js/src/jsinfer.h

@@ -13,6 +13,7 @@
 
 #include "jsalloc.h"
 #include "jsfriendapi.h"
+#include "jstypes.h"
 
 #include "ds/IdValuePair.h"
 #include "ds/LifoAlloc.h"

js/src/jsopcode.h

@@ -12,6 +12,7 @@
  */
 
 #include "jsbytecode.h"
+#include "jstypes.h"
 #include "NamespaceImports.h"
 
 #include "frontend/SourceNotes.h"

js/src/jsscript.h

@@ -18,6 +18,7 @@
 #endif
 #include "jsobj.h"
 #include "jsopcode.h"
+#include "jstypes.h"
 
 #include "gc/Barrier.h"
 #include "gc/Rooting.h"

js/src/jstypes.h

@@ -238,7 +238,11 @@
 #define JS_BITS_PER_BYTE 8
 #define JS_BITS_PER_BYTE_LOG2 3
 
-#define JS_BITS_PER_WORD (JS_BITS_PER_BYTE * JS_BYTES_PER_WORD)
+#if defined(JS_64BIT)
+# define JS_BITS_PER_WORD 64
+#else
+# define JS_BITS_PER_WORD 32
+#endif
 
 /***********************************************************************
 ** MACROS:      JS_FUNC_TO_DATA_PTR