From 0df748e7e2b2c3029ee152f96f89ed23690bda39 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 27 Jun 2002 09:54:07 +0000 Subject: [PATCH 1/1] Use bg instead of bag as argument to macros, to avoid clashes with structure field names. PR: 112 --- crypto/pkcs12/pkcs12.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/pkcs12/pkcs12.h b/crypto/pkcs12/pkcs12.h index 1786b6d4f3..dd338f266c 100644 --- 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_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) \ -- 2.34.1