Bug 503424 - Additional followup to fix more profound build-breakage, r=me.

js/src/jscntxt.h

@@ -55,7 +55,6 @@
 #include "jsprvtd.h"
 #include "jspubtd.h"
 #include "jsregexp.h"
-#include "jsstdint.h"
 #include "jsutil.h"
 #include "jsarray.h"
 #include "jstask.h"
@@ -109,7 +108,7 @@ namespace nanojit {
 }
 #if defined(JS_JIT_SPEW) || defined(DEBUG)
 struct FragPI;
-typedef nanojit::HashMap<uint32_t, FragPI, nanojit::DefaultHash<uint32_t> > FragStatsMap;
+typedef nanojit::HashMap<uint32, FragPI, nanojit::DefaultHash<uint32> > FragStatsMap;
 #endif
 class TraceRecorder;
 class VMAllocator;
@@ -204,7 +203,7 @@ struct JSTraceMonitor {
 #ifdef DEBUG
     /* Fields needed for fragment/guard profiling. */
     CLS(nanojit::Seq<nanojit::Fragment*>) branches;
-    uint32_t                lastFragID;
+    uint32                  lastFragID;
     /*
      * profAlloc has a lifetime which spans exactly from js_InitJIT to
      * js_FinishJIT.

js/src/jstracer.cpp

@@ -457,7 +457,7 @@ struct FragPI {
 };
 
 /* A mapping of Fragment.profFragID to FragPI */
-typedef HashMap<uint32_t,FragPI> FragStatsMap;
+typedef HashMap<uint32,FragPI> FragStatsMap;
 
 void
 js_FragProfiling_FragFinalizer(Fragment* f, JSTraceMonitor* tm)

js/src/nanojit/Assembler.cpp

@@ -763,7 +763,7 @@ namespace nanojit
         _codeAlloc.addRemainder(codeList, exitStart, exitEnd, _nExitSlot, _nExitIns);
         _codeAlloc.addRemainder(codeList, codeStart, codeEnd, _nSlot, _nIns);
         verbose_only( exitBytes -= (_nExitIns - _nExitSlot) * sizeof(NIns); )
-        verbose_only( codeBytes -= (_nIns - _nSlot) * sizeof(Nins); )
+        verbose_only( codeBytes -= (_nIns - _nSlot) * sizeof(NIns); )
 #else
         // [codeStart ... gap ... [_nIns, codeEnd))
         _codeAlloc.addRemainder(codeList, exitStart, exitEnd, exitStart, _nExitIns);