projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
610ac05
)
RT3031: Need to #undef some names for win32
author
Robin Lee
<robinlee.sysu@gmail.com>
Thu, 4 Sep 2014 16:36:41 +0000
(12:36 -0400)
committer
Rich Salz
<rsalz@openssl.org>
Mon, 8 Sep 2014 15:06:07 +0000
(11:06 -0400)
Copy the ifdef/undef stanza from x509.h to x509v3.h
Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
(cherry picked from commit
83e4e03eeb22d2fbaec516a466330f2ccab22864
)
crypto/x509v3/x509v3.h
patch
|
blob
|
history
diff --git
a/crypto/x509v3/x509v3.h
b/crypto/x509v3/x509v3.h
index 051b250abf6030899906e8e42740907b9df633ba..6556366277c3606fc2e6974fbb830425606b764d 100644
(file)
--- a/
crypto/x509v3/x509v3.h
+++ b/
crypto/x509v3/x509v3.h
@@
-66,6
+66,13
@@
extern "C" {
#endif
+#ifdef OPENSSL_SYS_WIN32
+/* Under Win32 these are defined in wincrypt.h */
+#undef X509_NAME
+#undef X509_CERT_PAIR
+#undef X509_EXTENSIONS
+#endif
+
/* Forward reference */
struct v3_ext_method;
struct v3_ext_ctx;