projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use bg instead of bag as argument to macros, to avoid clashes with
[openssl.git]
/
crypto
/
pkcs12
/
pkcs12.h
diff --git
a/crypto/pkcs12/pkcs12.h
b/crypto/pkcs12/pkcs12.h
index 1786b6d4f3cef1f263c46f7cab72605d81c04226..dd338f266cc47376a54903d67a80c071e2048a8e 100644
(file)
--- a/
crypto/pkcs12/pkcs12.h
+++ b/
crypto/pkcs12/pkcs12.h
@@
-156,8
+156,8
@@
union {
#define M_PKCS12_decrypt_skey PKCS12_decrypt_skey
#define M_PKCS8_decrypt PKCS8_decrypt
#define M_PKCS12_decrypt_skey PKCS12_decrypt_skey
#define M_PKCS8_decrypt PKCS8_decrypt
-#define M_PKCS12_bag_type(b
ag) OBJ_obj2nid(bag
->type)
-#define M_PKCS12_cert_bag_type(b
ag) OBJ_obj2nid(bag
->value.bag->type)
+#define M_PKCS12_bag_type(b
g) OBJ_obj2nid((bg)
->type)
+#define M_PKCS12_cert_bag_type(b
g) OBJ_obj2nid((bg)
->value.bag->type)
#define M_PKCS12_crl_bag_type M_PKCS12_cert_bag_type
#define PKCS12_get_attr(bag, attr_nid) \
#define M_PKCS12_crl_bag_type M_PKCS12_cert_bag_type
#define PKCS12_get_attr(bag, attr_nid) \