summaryrefslogtreecommitdiff
path: root/nss-tool
diff options
context:
space:
mode:
authorFranziskus Kiefer <franziskuskiefer@gmail.com>2018-08-03 10:35:44 +0200
committerFranziskus Kiefer <franziskuskiefer@gmail.com>2018-08-03 10:35:44 +0200
commit3d77547100b65036e847925ea82fba1f4b16eb20 (patch)
treebc0e1733407e9efe5bd009c6951837db61ccf64e /nss-tool
parent67eda0f65557d253094329c74b30d11c32d77550 (diff)
downloadnss-hg-3d77547100b65036e847925ea82fba1f4b16eb20.tar.gz
Bug 1479787 - build mozpkix as part of NSS, r=mt,keeler
Differential Revision: https://phabricator.services.mozilla.com/D2719 Differential Revision: https://phabricator.services.mozilla.com/D2720 Differential Revision: https://phabricator.services.mozilla.com/D2861
Diffstat (limited to 'nss-tool')
-rw-r--r--nss-tool/common/util.h2
-rw-r--r--nss-tool/db/dbtool.cc2
-rw-r--r--nss-tool/digest/digesttool.cc2
-rw-r--r--nss-tool/enc/enctool.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/nss-tool/common/util.h b/nss-tool/common/util.h
index 58fb05839..e7076336b 100644
--- a/nss-tool/common/util.h
+++ b/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/nss-tool/db/dbtool.cc b/nss-tool/db/dbtool.cc
index 8c369cf05..5cd1f5608 100644
--- a/nss-tool/db/dbtool.cc
+++ b/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/nss-tool/digest/digesttool.cc b/nss-tool/digest/digesttool.cc
index 08c3e3ba7..5efe6390c 100644
--- a/nss-tool/digest/digesttool.cc
+++ b/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/nss-tool/enc/enctool.h b/nss-tool/enc/enctool.h
index 5a6a5a164..df5f44950 100644
--- a/nss-tool/enc/enctool.h
+++ b/nss-tool/enc/enctool.h
@@ -9,7 +9,7 @@
#include <vector>
#include "argparse.h"
#include "prerror.h"
-#include "scoped_ptrs.h"
+#include "nss_scoped_ptrs.h"
#include "tool.h"
class EncTool : public Tool {