1 files changed, 3 insertions, 0 deletions
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