diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-12-17 14:12:04 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-12-17 14:12:04 +0100 |
| commit | 51b821b3fdc5a7eab2369cb6a6680598a6264b08 (patch) | |
| tree | f3608a518bbb9e31b0a42b9a10742fb11ef5b39b /security/nss/nss-tool | |
| parent | 8e44bbb43789e585fab9fc1ce8becc94b45d566c (diff) | |
| parent | 680c3eadb6aaec1f3653636db081a519e0f62ef5 (diff) | |
| download | UXP-51b821b3fdc5a7eab2369cb6a6680598a6264b08.tar UXP-51b821b3fdc5a7eab2369cb6a6680598a6264b08.tar.gz UXP-51b821b3fdc5a7eab2369cb6a6680598a6264b08.tar.lz UXP-51b821b3fdc5a7eab2369cb6a6680598a6264b08.tar.xz UXP-51b821b3fdc5a7eab2369cb6a6680598a6264b08.zip | |
Merge branch 'master' into Sync-weave
Diffstat (limited to 'security/nss/nss-tool')
| -rw-r--r-- | security/nss/nss-tool/common/util.h | 2 | ||||
| -rw-r--r-- | security/nss/nss-tool/db/dbtool.cc | 2 | ||||
| -rw-r--r-- | security/nss/nss-tool/digest/digesttool.cc | 2 | ||||
| -rw-r--r-- | security/nss/nss-tool/enc/enctool.h | 2 |
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 { |