summaryrefslogtreecommitdiff
path: root/security/nss/lib/smime
diff options
context:
space:
mode:
authoremaldona%redhat.com <devnull@localhost>2011-02-24 22:06:14 +0000
committeremaldona%redhat.com <devnull@localhost>2011-02-24 22:06:14 +0000
commit35667a4a1004b5475167643954c0ee5b9a345aab (patch)
tree6dbdeaa3433ba42404446efb02d45e4b3b142157 /security/nss/lib/smime
parentb8f2aa84143ba0d4d515b6510c3e85a4308f1a5f (diff)
downloadnss-hg-35667a4a1004b5475167643954c0ee5b9a345aab.tar.gz
Bug 632439 - cms headers cmst.h and cms.h use C++ reserved identifiers 'private' and 'template, r=caillon
Diffstat (limited to 'security/nss/lib/smime')
-rw-r--r--security/nss/lib/smime/cms.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/nss/lib/smime/cms.h b/security/nss/lib/smime/cms.h
index 4dea9f05d..3162e9bc1 100644
--- a/security/nss/lib/smime/cms.h
+++ b/security/nss/lib/smime/cms.h
@@ -1171,7 +1171,7 @@ NSS_CMSDEREncode(NSSCMSMessage *cmsg, SECItem *input, SECItem *derOut,
* against that data structure.
*/
SECStatus NSS_CMSType_RegisterContentType(SECOidTag type,
- SEC_ASN1Template *template, size_t size,
+ SEC_ASN1Template *asn1Template, size_t size,
NSSCMSGenericWrapperDataDestroy destroy,
NSSCMSGenericWrapperDataCallback decode_before,
NSSCMSGenericWrapperDataCallback decode_after,