diff options
| author | Moonchild <git-repo@palemoon.org> | 2020-02-20 16:50:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-20 16:50:49 +0100 |
| commit | 7832dded378423f245cb8cf8ef66c4c16a39f6e8 (patch) | |
| tree | 8942443c378dfbe069af0bab196fa63a212adc83 /js/src/shell/js.cpp | |
| parent | 0e9957c412002000067479e7ce582e8d625e21c0 (diff) | |
| parent | d53b11c9dc34d0a8c3bb4ad862cff1e0ce566457 (diff) | |
| download | UXP-7832dded378423f245cb8cf8ef66c4c16a39f6e8.tar UXP-7832dded378423f245cb8cf8ef66c4c16a39f6e8.tar.gz UXP-7832dded378423f245cb8cf8ef66c4c16a39f6e8.tar.lz UXP-7832dded378423f245cb8cf8ef66c4c16a39f6e8.tar.xz UXP-7832dded378423f245cb8cf8ef66c4c16a39f6e8.zip | |
Merge pull request #1458 from MoonchildProductions/316
Fix buildability of builds without devtools-server
Diffstat (limited to 'js/src/shell/js.cpp')
| -rw-r--r-- | js/src/shell/js.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp index 36558a694..4b0c858a4 100644 --- a/js/src/shell/js.cpp +++ b/js/src/shell/js.cpp @@ -7090,6 +7090,7 @@ NewGlobalObject(JSContext* cx, JS::CompartmentOptions& options, if (!DefineOS(cx, glob, fuzzingSafe, &gOutFile, &gErrFile)) return nullptr; +#ifdef MOZ_DEVTOOLS_SERVER RootedObject performanceObj(cx, JS_NewObject(cx, nullptr)); if (!performanceObj) return nullptr; @@ -7105,6 +7106,7 @@ NewGlobalObject(JSContext* cx, JS::CompartmentOptions& options, return nullptr; if (!JS_DefineProperty(cx, mozMemoryObj, "gc", gcObj, JSPROP_ENUMERATE)) return nullptr; +#endif /* Initialize FakeDOMObject. */ static const js::DOMCallbacks DOMcallbacks = { |