From 6f1d8fcce1f064447ccf778ea9925efae95bb5fc Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Thu, 19 Mar 2020 23:01:29 +0100 Subject: Issue #1467 - Part 4: Rename NSS_SQLSTORE to MOZ_SECURITY_SQLSTORE. Rename the build config option accordingly. --- security/manager/ssl/nsNSSComponent.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'security/manager/ssl') diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp index 6d1e3c5f7..897b5743c 100644 --- a/security/manager/ssl/nsNSSComponent.cpp +++ b/security/manager/ssl/nsNSSComponent.cpp @@ -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 storageService = do_GetService(MOZ_STORAGE_SERVICE_CONTRACTID); if (!storageService) { -- cgit v1.2.3