summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2002-06-27 09:54:23 +0000
committerRichard Levitte <levitte@openssl.org>2002-06-27 09:54:23 +0000
commitd466e8eb5aaac32820e8f0981f2e82598cb4f767 (patch)
treec3328822a6ebe1d7f862f7f83f4960f9e1e1835f
parent2edfbc53d8ec4cefde8ff68954cfcacb646d99dc (diff)
Use bg instead of bag as argument to macros, to avoid clashes with
structure field names. PR: 112
-rw-r--r--crypto/pkcs12/pkcs12.h4
1 files 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) \