Bug 1256291: Fix unified build under js/; r=Ms2ger
authorBenjamin Bouvier <benj@benj.me>
Mon, 14 Mar 2016 14:22:51 +0100
changeset 288561 23bb5776bd4fffe41919d79f814a261254b5dbf1
parent 288560 9814ff02695354505c46acc4fa86745336136966
child 288562 422077f61bcb9ae19215de09e635c1082357233e
child 288569 fb639ac493bcdf7c92f6a06cffd161a9c95a031f
push id30084
push userkwierso@gmail.com
push dateTue, 15 Mar 2016 00:39:07 +0000
treeherdermozilla-central@422077f61bcb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMs2ger
bugs1256291
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1256291: Fix unified build under js/; r=Ms2ger MozReview-Commit-ID: Amia14nqztf
js/src/asmjs/WasmBinaryToText.cpp
js/src/asmjs/WasmTextToBinary.cpp
js/src/gc/Marking.cpp
--- a/js/src/asmjs/WasmBinaryToText.cpp
+++ b/js/src/asmjs/WasmBinaryToText.cpp
@@ -16,16 +16,17 @@
  * limitations under the License.
  */
 
 #include "asmjs/WasmBinaryToText.h"
 
 #include "mozilla/CheckedInt.h"
 
 #include "jsnum.h"
+#include "jsprf.h"
 
 #include "asmjs/Wasm.h"
 #include "asmjs/WasmTypes.h"
 #include "vm/ArrayBufferObject.h"
 #include "vm/StringBuffer.h"
 
 using namespace js;
 using namespace js::wasm;
--- a/js/src/asmjs/WasmTextToBinary.cpp
+++ b/js/src/asmjs/WasmTextToBinary.cpp
@@ -23,16 +23,17 @@
 #include "mozilla/Maybe.h"
 
 #include "jsdtoa.h"
 #include "jsnum.h"
 #include "jsprf.h"
 #include "jsstr.h"
 
 #include "asmjs/WasmBinary.h"
+#include "asmjs/WasmTypes.h"
 #include "ds/LifoAlloc.h"
 #include "js/CharacterEncoding.h"
 #include "js/HashTable.h"
 
 using namespace js;
 using namespace js::wasm;
 
 using mozilla::BitwiseCast;
--- a/js/src/gc/Marking.cpp
+++ b/js/src/gc/Marking.cpp
@@ -10,16 +10,17 @@
 #include "mozilla/IntegerRange.h"
 #include "mozilla/ReentrancyGuard.h"
 #include "mozilla/ScopeExit.h"
 #include "mozilla/TypeTraits.h"
 
 #include "jsgc.h"
 #include "jsprf.h"
 
+#include "asmjs/WasmModule.h"
 #include "builtin/ModuleObject.h"
 #include "gc/GCInternals.h"
 #include "gc/Policy.h"
 #include "jit/IonCode.h"
 #include "js/SliceBudget.h"
 #include "vm/ArgumentsObject.h"
 #include "vm/ArrayObject.h"
 #include "vm/ScopeObject.h"