Bug 911216 - Fix non-Nightly bustage. a=ryanvm CLOSED TREE
authorTill Schneidereit <till@tillschneidereit.net>
Mon, 01 Aug 2016 17:48:46 +0200
changeset 347544 70ee99f185b48cb59a4ec701282bf6a3fd6ce3e3
parent 347543 203106ef6cb65f538d747bc7977eaab7f72444c1
child 347545 cace1687008bb7f514b76017f62895c23ec18c2c
push id6389
push userraliiev@mozilla.com
push dateMon, 19 Sep 2016 13:38:22 +0000
treeherdermozilla-beta@01d67bfe6c81 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersryanvm
bugs911216
milestone50.0a2
Bug 911216 - Fix non-Nightly bustage. a=ryanvm CLOSED TREE
js/src/vm/GlobalObject.cpp
--- a/js/src/vm/GlobalObject.cpp
+++ b/js/src/vm/GlobalObject.cpp
@@ -19,22 +19,20 @@
 #include "builtin/AtomicsObject.h"
 #include "builtin/Eval.h"
 #if EXPOSE_INTL_API
 # include "builtin/Intl.h"
 #endif
 #include "builtin/MapObject.h"
 #include "builtin/ModuleObject.h"
 #include "builtin/Object.h"
-#include "builtin/RegExp.h"
-
-#ifdef NIGHTLY_BUILD
+#ifdef SPIDERMONKEY_PROMISE
 #include "builtin/Promise.h"
 #endif
-
+#include "builtin/RegExp.h"
 #include "builtin/SelfHostingDefines.h"
 #include "builtin/SymbolObject.h"
 #include "builtin/TypedObject.h"
 #include "builtin/WeakMapObject.h"
 #include "builtin/WeakSetObject.h"
 #include "vm/Debugger.h"
 #include "vm/HelperThreads.h"
 #include "vm/PIC.h"