wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-04 06:48:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #1467 - Part 4: Rename NSS_SQLSTORE to MOZ_SECURITY_SQLSTORE.

Browse source 
Rename the build config option accordingly.
This commit is contained in:
wolfbeast 2020-03-19 23:01:29 +01:00 • committed by Roy Tam
commit 8778ddfc52
5 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
security/manager/ssl/nsNSSComponent.cpp
View file

@ -12,7 +12,7 @@
#include "SharedSSLState.h"
#include "cert.h"
#include "certdb.h"
#ifdef NSS_SQLSTORE
#ifdef MOZ_SECURITY_SQLSTORE
#include "mozStorageCID.h"
#endif
#include "mozilla/ArrayUtils.h"
@ -1712,7 +1712,7 @@ GetNSSProfilePath(nsAutoCString& aProfilePath)
("Could not get nsILocalFileWin for profile directory.\n"));
return NS_ERROR_FAILURE;
}
#ifdef NSS_SQLSTORE
#ifdef MOZ_SECURITY_SQLSTORE
// SQLite always takes UTF-8 file paths regardless of the current system
// code page.
nsAutoString u16ProfilePath;
@ -1982,7 +1982,7 @@ nsNSSComponent::Init()
return NS_ERROR_NOT_SAME_THREAD;
}
#ifdef NSS_SQLSTORE
#ifdef MOZ_SECURITY_SQLSTORE
// To avoid an sqlite3_config race in NSS init, we require the storage service to get initialized first.
nsCOMPtr<nsISupports> storageService = do_GetService(MOZ_STORAGE_SERVICE_CONTRACTID);
if (!storageService) {