projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move the Win32 #undefs of X509_NAME and PKCS7_ISSUER_AND_SERIAL so they will
[openssl.git]
/
e_os.h
diff --git
a/e_os.h
b/e_os.h
index bbb1c304d6556c2e0d8a66dccb2b10484607dfe0..b8d053bda573aa083d2926948c50dc87ce1aa774 100644
(file)
--- a/
e_os.h
+++ b/
e_os.h
@@
-103,9
+103,6
@@
extern "C" {
#ifdef WIN32
#define get_last_sys_error() GetLastError()
#define clear_sys_error() SetLastError(0)
#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
#if !defined(WINNT)
#define WIN_CONSOLE_BUG
#endif