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 /modules/libpref/Preferences.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 'modules/libpref/Preferences.cpp')
| -rw-r--r-- | modules/libpref/Preferences.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp index f36819236..31867ca0a 100644 --- a/modules/libpref/Preferences.cpp +++ b/modules/libpref/Preferences.cpp @@ -466,9 +466,7 @@ Preferences::IsServiceAvailable() bool Preferences::InitStaticMembers() { -#ifndef MOZ_B2G MOZ_ASSERT(NS_IsMainThread()); -#endif if (!sShutdown && !sPreferences) { nsCOMPtr<nsIPrefService> prefService = |