diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-02-20 10:02:49 -0500 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 12:47:38 +0200 |
| commit | 6407f1abd4f2f598f42cd416d7de9345c77e2444 (patch) | |
| tree | ce442ff39c5a091c6af7cb5e635276aeaca5a850 /dom | |
| parent | 28f0155307b8182653e31c1dd969828bbb0249f0 (diff) | |
| download | UXP-6407f1abd4f2f598f42cd416d7de9345c77e2444.tar UXP-6407f1abd4f2f598f42cd416d7de9345c77e2444.tar.gz UXP-6407f1abd4f2f598f42cd416d7de9345c77e2444.tar.lz UXP-6407f1abd4f2f598f42cd416d7de9345c77e2444.tar.xz UXP-6407f1abd4f2f598f42cd416d7de9345c77e2444.zip | |
Issue #1457 - Unfold sqlite3 from nss
Diffstat (limited to 'dom')
| -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; |