summaryrefslogtreecommitdiffstats
path: root/security/nss/nss-tool
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-12-15 01:42:53 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-12-15 01:42:53 +0100
commit74cabf7948b2597f5b6a67d6910c844fd1a88ff6 (patch)
treedb1f30ada487c3831ea8e4e98b2d39edc9e88eea /security/nss/nss-tool
parent09ef48bd005a7f9e97a3fe797a079fcf2b5e58d3 (diff)
downloadUXP-74cabf7948b2597f5b6a67d6910c844fd1a88ff6.tar
UXP-74cabf7948b2597f5b6a67d6910c844fd1a88ff6.tar.gz
UXP-74cabf7948b2597f5b6a67d6910c844fd1a88ff6.tar.lz
UXP-74cabf7948b2597f5b6a67d6910c844fd1a88ff6.tar.xz
UXP-74cabf7948b2597f5b6a67d6910c844fd1a88ff6.zip
Update NSS to 3.41
Diffstat (limited to 'security/nss/nss-tool')
-rw-r--r--security/nss/nss-tool/common/util.h2
-rw-r--r--security/nss/nss-tool/db/dbtool.cc2
-rw-r--r--security/nss/nss-tool/digest/digesttool.cc2
-rw-r--r--security/nss/nss-tool/enc/enctool.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/security/nss/nss-tool/common/util.h b/security/nss/nss-tool/common/util.h
index 58fb05839..e7076336b 100644
--- a/security/nss/nss-tool/common/util.h
+++ b/security/nss/nss-tool/common/util.h
@@ -6,7 +6,7 @@
#define util_h__
#include "nspr.h"
-#include "scoped_ptrs.h"
+#include "nss_scoped_ptrs.h"
#include <secmodt.h>
#include <string>
diff --git a/security/nss/nss-tool/db/dbtool.cc b/security/nss/nss-tool/db/dbtool.cc
index 8c369cf05..5cd1f5608 100644
--- a/security/nss/nss-tool/db/dbtool.cc
+++ b/security/nss/nss-tool/db/dbtool.cc
@@ -4,7 +4,7 @@
#include "dbtool.h"
#include "argparse.h"
-#include "scoped_ptrs.h"
+#include "nss_scoped_ptrs.h"
#include "util.h"
#include <iomanip>
diff --git a/security/nss/nss-tool/digest/digesttool.cc b/security/nss/nss-tool/digest/digesttool.cc
index 08c3e3ba7..5efe6390c 100644
--- a/security/nss/nss-tool/digest/digesttool.cc
+++ b/security/nss/nss-tool/digest/digesttool.cc
@@ -4,7 +4,7 @@
#include "digesttool.h"
#include "argparse.h"
-#include "scoped_ptrs.h"
+#include "nss_scoped_ptrs.h"
#include "util.h"
#include <algorithm>
diff --git a/security/nss/nss-tool/enc/enctool.h b/security/nss/nss-tool/enc/enctool.h
index 5a6a5a164..f2296bb26 100644
--- a/security/nss/nss-tool/enc/enctool.h
+++ b/security/nss/nss-tool/enc/enctool.h
@@ -8,8 +8,8 @@
#include <string>
#include <vector>
#include "argparse.h"
+#include "nss_scoped_ptrs.h"
#include "prerror.h"
-#include "scoped_ptrs.h"
#include "tool.h"
class EncTool : public Tool {