summaryrefslogtreecommitdiffstats
path: root/security/manager
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2020-03-19 23:01:29 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-14 13:12:08 +0200
commit09655ad6d8d8afe07c5aac4da6d5f3cf0f95e709 (patch)
tree2061a349d7ef66d4e8a382f71ded0d5e11d2b0cb /security/manager
parent4fd0b98c2c67468dbb8b72b4389c4b1b8390e5ff (diff)
downloadUXP-09655ad6d8d8afe07c5aac4da6d5f3cf0f95e709.tar
UXP-09655ad6d8d8afe07c5aac4da6d5f3cf0f95e709.tar.gz
UXP-09655ad6d8d8afe07c5aac4da6d5f3cf0f95e709.tar.lz
UXP-09655ad6d8d8afe07c5aac4da6d5f3cf0f95e709.tar.xz
UXP-09655ad6d8d8afe07c5aac4da6d5f3cf0f95e709.zip
Issue #1467 - Part 4: Rename NSS_SQLSTORE to MOZ_SECURITY_SQLSTORE.
Rename the build config option accordingly.
Diffstat (limited to 'security/manager')
-rw-r--r--security/manager/ssl/nsNSSComponent.cpp6
1 files changed, 3 insertions, 3 deletions
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<nsISupports> storageService = do_GetService(MOZ_STORAGE_SERVICE_CONTRACTID);
if (!storageService) {