Use bg instead of bag as argument to macros, to avoid clashes with
authorRichard Levitte <levitte@openssl.org>
Thu, 27 Jun 2002 09:54:07 +0000 (09:54 +0000)
committerRichard Levitte <levitte@openssl.org>
Thu, 27 Jun 2002 09:54:07 +0000 (09:54 +0000)
structure field names.
PR: 112

crypto/pkcs12/pkcs12.h

index 1786b6d..dd338f2 100644 (file)
@@ -156,8 +156,8 @@ union {
 #define M_PKCS12_decrypt_skey PKCS12_decrypt_skey
 #define M_PKCS8_decrypt PKCS8_decrypt
 
-#define M_PKCS12_bag_type(bag) OBJ_obj2nid(bag->type)
-#define M_PKCS12_cert_bag_type(bag) OBJ_obj2nid(bag->value.bag->type)
+#define M_PKCS12_bag_type(bg) OBJ_obj2nid((bg)->type)
+#define M_PKCS12_cert_bag_type(bg) OBJ_obj2nid((bg)->value.bag->type)
 #define M_PKCS12_crl_bag_type M_PKCS12_cert_bag_type
 
 #define PKCS12_get_attr(bag, attr_nid) \