diff options
| author | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2018-06-04 16:25:04 +0200 |
|---|---|---|
| committer | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2018-06-04 16:25:04 +0200 |
| commit | 61536d274985960277a47ff43a798367c37b804f (patch) | |
| tree | 3a13784a855f5bf8dbd6bb2a031255dd6a857e60 | |
| parent | 78ac43a58d86230705bd7dfe0d8c94827f31540c (diff) | |
| download | nss-hg-61536d274985960277a47ff43a798367c37b804f.tar.gz | |
fix abi and clang-format, a=meNSS_3_36_3_RTM
| -rw-r--r-- | automation/abi-check/expected-report-libssl3.so.txt | 2 | ||||
| -rw-r--r-- | cpputil/scoped_ptrs.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/automation/abi-check/expected-report-libssl3.so.txt b/automation/abi-check/expected-report-libssl3.so.txt index 366591b84..ad818d0aa 100644 --- a/automation/abi-check/expected-report-libssl3.so.txt +++ b/automation/abi-check/expected-report-libssl3.so.txt @@ -4,7 +4,7 @@ [C]'function SECStatus SSL_GetChannelInfo(PRFileDesc*, SSLChannelInfo*, PRUintn)' at sslinfo.c:12:1 has some indirect sub-type changes: parameter 2 of type 'SSLChannelInfo*' has sub-type changes: in pointed to type 'typedef SSLChannelInfo' at sslt.h:318:1: - underlying type 'struct SSLChannelInfoStr' at sslt.h:259:1 changed: + underlying type 'struct SSLChannelInfoStr' at sslt.h:251:1 changed: type size hasn't changed 1 data member change: type of 'SSLSignatureScheme SSLChannelInfoStr::signatureScheme' changed: diff --git a/cpputil/scoped_ptrs.h b/cpputil/scoped_ptrs.h index 85da99e62..8a0b4f5ab 100644 --- a/cpputil/scoped_ptrs.h +++ b/cpputil/scoped_ptrs.h @@ -10,10 +10,10 @@ #include <memory> #include "cert.h" #include "keyhi.h" +#include "p12.h" #include "pk11pub.h" #include "pkcs11uri.h" #include "sslexp.h" -#include "p12.h" struct ScopedDelete { void operator()(CERTCertificate* cert) { CERT_DestroyCertificate(cert); } |