From f5eac85edcb6e8b24593282c9e140daeeb758cac Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Wed, 12 May 1999 01:56:27 +0000
Subject: Add new -out option to asn1parse to allow the parsed data to be
 output. Fixed -strparse option: it didn't work if used more than once (this
 was due to the d2i_ASN1_TYPE call parsing a freed buffer). On Win32 the file
 wincrypt.h #define's X509_NAME and PKCS7_SIGNER_INFO causing clashes so these
 are #undef'ed

---
 e_os.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'e_os.h')

diff --git a/e_os.h b/e_os.h
index cff94e3e2d..9f525cb8e1 100644
--- a/e_os.h
+++ b/e_os.h
@@ -98,6 +98,9 @@ extern "C" {
 #ifdef WIN32
 #define get_last_sys_error()	GetLastError()
 #define clear_sys_error()	SetLastError(0)
+/* These are defined in wincrypt.h and can cause problems */
+#undef X509_NAME
+#undef PKCS7_SIGNER_INFO
 #if !defined(WINNT)
 #define WIN_CONSOLE_BUG
 #endif
-- 
cgit v1.2.3