Merge pull request #190 from DavidMulder/windows_code_ifdefs

The evp-w32.h header should not be included on all platforms
2016-08-02 18:30:21 -04:00
parent f0f24fdbb2 2bee5966ab
commit f027fc834d
3 changed files with 6 additions and 0 deletions
--- a/lib/hcrypto/evp.c
+++ b/lib/hcrypto/evp.c
@@ -44,7 +44,9 @@
 #include <evp.h>
 #include <evp-hcrypto.h>
 #include <evp-cc.h>
+#if _WIN32
 #include <evp-w32.h>
+#endif
 #include <evp-pkcs11.h>
 #include <evp-openssl.h>

--- a/lib/hcrypto/test_bulk.c
+++ b/lib/hcrypto/test_bulk.c
@@ -39,7 +39,9 @@
 #include <evp.h>
 #include <evp-hcrypto.h>
 #include <evp-cc.h>
+#if _WIN32
 #include <evp-w32.h>
+#endif
 #include <evp-pkcs11.h>
 #include <hex.h>
 #include <err.h>
--- a/lib/hcrypto/test_cipher.c
+++ b/lib/hcrypto/test_cipher.c
@@ -41,7 +41,9 @@
 #include <evp.h>
 #include <evp-hcrypto.h>
 #include <evp-cc.h>
+#if _WIN32
 #include <evp-w32.h>
+#endif
 #include <evp-pkcs11.h>
 #include <evp-openssl.h>
 #include <hex.h>