diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 21:49:04 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 21:49:04 +0200 |
| commit | 39dac57259cff8b61db0b22cb2ad0a8adb02692e (patch) | |
| tree | 52a026cc8c22793eb17fd0f5e22adce1ae08a1dd /dom/system/OSFileConstants.cpp | |
| parent | a1cce3b2b00bbd9f4983013ddd8934a7bccb9e99 (diff) | |
| parent | c2d9ab62f3d097c9e0e00184cab1f546554f5eaa (diff) | |
| download | UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.gz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.lz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.xz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.zip | |
Merge branch 'redwood' into 28.9-platform
Diffstat (limited to 'dom/system/OSFileConstants.cpp')
| -rw-r--r-- | dom/system/OSFileConstants.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/dom/system/OSFileConstants.cpp b/dom/system/OSFileConstants.cpp index 86377e75a..ec84d784b 100644 --- a/dom/system/OSFileConstants.cpp +++ b/dom/system/OSFileConstants.cpp @@ -1048,22 +1048,11 @@ bool DefineOSFileConstants(JSContext *cx, JS::Handle<JSObject*> global) } #endif // defined(XP_MACOSX) - // sqlite3 is linked from different places depending on the platform + // sqlite3 is always a shared lib nsAutoString libsqlite3; -#if defined(ANDROID) - // On Android, we use the system's libsqlite3 - libsqlite3.AppendLiteral(DLL_PREFIX); - libsqlite3.AppendLiteral("sqlite3"); - libsqlite3.AppendLiteral(DLL_SUFFIX); -#elif defined(XP_WIN) - // On Windows, for some reason, this is part of nss3.dll libsqlite3.AppendLiteral(DLL_PREFIX); - libsqlite3.AppendLiteral("nss3"); + libsqlite3.AppendLiteral("mozsqlite3"); libsqlite3.AppendLiteral(DLL_SUFFIX); -#else - // On other platforms, we link sqlite3 into libxul - libsqlite3 = libxul; -#endif // defined(ANDROID) || defined(XP_WIN) if (!SetStringProperty(cx, objPath, "libsqlite3", libsqlite3)) { return false; |