Merge from 0.9.7-stable.

diff --git a/crypto/md5/md5.h b/crypto/md5/md5.h
index 52cb753e6a93a66ab72eb8666fe11ce1a987be9a..cfdbf03fe16916fe4e7edb859537880d1f56ec3a 100644 (file)
--- a/crypto/md5/md5.h
+++ b/crypto/md5/md5.h
@@ -59,6 +59,8 @@
 #ifndef HEADER_MD5_H
 #define HEADER_MD5_H
 
+#include <openssl/e_os2.h>
+
 #ifdef  __cplusplus
 extern "C" {
 #endif

diff --git a/crypto/md5/md5_locl.h b/crypto/md5/md5_locl.h
index 85ae99210ceb6cf05797b97f93c89b12af1238f0..9e360da732ab2721a623ea24f5ec1d61b92a2a31 100644 (file)
--- a/crypto/md5/md5_locl.h
+++ b/crypto/md5/md5_locl.h
@@ -58,7 +58,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <openssl/opensslconf.h>
+#include <openssl/e_os2.h>
 #include <openssl/md5.h>
 
 #ifndef MD5_LONG_LOG2
@@ -68,7 +68,7 @@
 #ifdef MD5_ASM
 # if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__)
 #  define md5_block_host_order md5_block_asm_host_order
-# elif defined(__sparc) && defined(OPENSSL_SYSNAME_ULTRASPARC)
+# elif defined(__sparc) && defined(OPENSSL_SYS_ULTRASPARC)
    void md5_block_asm_data_order_aligned (MD5_CTX *c, const MD5_LONG *p,int num);
 #  define HASH_BLOCK_DATA_ORDER_ALIGNED md5_block_asm_data_order_aligned
 # endif

diff --git a/crypto/ossl_typ.h b/crypto/ossl_typ.h
index 420d5e68fb77a6d724c544b76d79a9a49179d629..b50e9ae256e71ce979c811c428012a3fde830956 100644 (file)
--- a/crypto/ossl_typ.h
+++ b/crypto/ossl_typ.h
@@ -55,6 +55,8 @@
 #ifndef HEADER_OPENSSL_TYPES_H
 #define HEADER_OPENSSL_TYPES_H
 
+#include <openssl/e_os2.h>
+
 #ifdef NO_ASN1_TYPEDEFS
 #define ASN1_INTEGER           ASN1_STRING
 #define ASN1_ENUMERATED                ASN1_STRING