diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-14 10:50:01 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-14 10:50:01 +0200 |
| commit | e9dd029f5d00590e1a53e63b0ab805110a10b54c (patch) | |
| tree | 1126ca5dda925a62be3dc12c99c90e953d08afcf /dom/system/OSFileConstants.cpp | |
| parent | 9d6a7ae25d7f5da855a8f8df884de483b4e2a538 (diff) | |
| parent | 36b8fd734f590eb726ca2e50f8d1ff9cc968b8e1 (diff) | |
| download | UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar.gz UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar.lz UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar.xz UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.zip | |
Merge branch 'master' into Basilisk-release
Diffstat (limited to 'dom/system/OSFileConstants.cpp')
| -rw-r--r-- | dom/system/OSFileConstants.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/dom/system/OSFileConstants.cpp b/dom/system/OSFileConstants.cpp index 945233f4c..86377e75a 100644 --- a/dom/system/OSFileConstants.cpp +++ b/dom/system/OSFileConstants.cpp @@ -924,16 +924,6 @@ bool DefineOSFileConstants(JSContext *cx, JS::Handle<JSObject*> global) return false; } -#if defined(MOZ_WIDGET_GONK) - JSString* strVersion = JS_NewStringCopyZ(cx, "Gonk"); - if (!strVersion){ - return false; - } - JS::Rooted<JS::Value> valVersion(cx, JS::StringValue(strVersion)); - if (!JS_SetProperty(cx, objSys, "Name", valVersion)) { - return false; - } -#else nsCOMPtr<nsIXULRuntime> runtime = do_GetService(XULRUNTIME_SERVICE_CONTRACTID); if (runtime) { nsAutoCString os; @@ -950,7 +940,6 @@ bool DefineOSFileConstants(JSContext *cx, JS::Handle<JSObject*> global) return false; } } -#endif // defined(MOZ_WIDGET_GONK) #if defined(DEBUG) JS::Rooted<JS::Value> valDebug(cx, JS::TrueValue()); |