From d466e8eb5aaac32820e8f0981f2e82598cb4f767 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 27 Jun 2002 09:54:23 +0000 Subject: [PATCH] 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 fefa1a6a1f..08bf15ae37 100644 --- a/crypto/pkcs12/pkcs12.h +++ b/crypto/pkcs12/pkcs12.h @@ -141,8 +141,8 @@ union { #define PKCS12_ERROR 0 #define PKCS12_OK 1 -#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 M_PKCS12_x5092certbag(x509) \ -- 2.25.1