Because there's chances we clash with the system's types.h, rename our

types.h to ossl_typ.h.

diff --git a/apps/apps.h b/apps/apps.h
index 57ca7659ae1861ebccaac2595c84fe83cf47a735..07ddd4c3ad75b8b483e6b321c747ac7c26017ef5 100644 (file)
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -68,7 +68,7 @@
 #include <openssl/lhash.h>
 #include <openssl/conf.h>
 #include <openssl/txt_db.h>
-#include <openssl/types.h>
+#include <openssl/ossl_typ.h>
 
 int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn);
 int app_RAND_write_file(const char *file, BIO *bio_e);

diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index 279020be619bc3376286cecb8a0c8efda32bfbef..363070b8ab7635d996d1394f0103f9f5bdfafa49 100644 (file)
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -71,7 +71,7 @@
 #include <openssl/symhacks.h>
 
 #include <openssl/e_os2.h>
-#include <openssl/types.h>
+#include <openssl/ossl_typ.h>
 
 #ifdef OPENSSL_BUILD_SHLIBCRYPTO
 # undef OPENSSL_EXTERN

diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h
index 65d61e2bb7b47fc6acfc7a5ea069e5145d646509..e9cb99d994339a8eefe1a85390c65f778bf3ff8e 100644 (file)
--- a/crypto/dh/dh.h
+++ b/crypto/dh/dh.h
@@ -68,7 +68,7 @@
 #endif
 #include <openssl/bn.h>
 #include <openssl/crypto.h>
-#include <openssl/types.h>
+#include <openssl/ossl_typ.h>
        
 #define DH_FLAG_CACHE_MONT_P   0x01
 

diff --git a/crypto/dsa/dsa.h b/crypto/dsa/dsa.h
index 9692a0b6ff8cc22ba9b1e52c21efb2aa694a78d7..dcdd28f94d497c1d1448813ec00eeb8b80fedb2b 100644 (file)
--- a/crypto/dsa/dsa.h
+++ b/crypto/dsa/dsa.h
@@ -74,7 +74,7 @@
 #endif
 #include <openssl/bn.h>
 #include <openssl/crypto.h>
-#include <openssl/types.h>
+#include <openssl/ossl_typ.h>
 #ifndef OPENSSL_NO_DH
 # include <openssl/dh.h>
 #endif

diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h
index 51c108ec24f9c5d23679005860a8ee394cee9800..782d85a9be8f0e6364a691ed51e8f6096d739562 100644 (file)
--- a/crypto/engine/engine.h
+++ b/crypto/engine/engine.h
@@ -59,7 +59,7 @@
 #ifndef HEADER_ENGINE_H
 #define HEADER_ENGINE_H
 
-#include <openssl/types.h>
+#include <openssl/ossl_typ.h>
 #include <openssl/bn.h>
 #ifndef OPENSSL_NO_RSA
 #include <openssl/rsa.h>
@@ -74,7 +74,6 @@
 #include <openssl/ui.h>
 #include <openssl/symhacks.h>
 #include <openssl/err.h>
-#include <openssl/types.h>
 
 #ifdef  __cplusplus
 extern "C" {

diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index 494fa0c65e8320dcc4a592137320fac692e9cdf2..5022d93dc9ca7ee1d86ca9d6350ca6744c4f2b6d 100644 (file)
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -67,7 +67,7 @@
 # undef OPENSSL_ALGORITHM_DEFINES
 #endif
 
-#include <openssl/types.h>
+#include <openssl/ossl_typ.h>
 
 #ifndef OPENSSL_NO_BIO
 #include <openssl/bio.h>

diff --git a/crypto/types.h b/crypto/ossl_typ.h
similarity index 100%
rename from crypto/types.h
rename to crypto/ossl_typ.h

diff --git a/crypto/pkcs7/pkcs7.h b/crypto/pkcs7/pkcs7.h
index 1dda0c5a587350fa589589db1622b628f41a297c..946596c8d9ecfb9b1abf6200090b17cbaeec1a74 100644 (file)
--- a/crypto/pkcs7/pkcs7.h
+++ b/crypto/pkcs7/pkcs7.h
@@ -64,7 +64,7 @@
 #include <openssl/e_os2.h>
 
 #include <openssl/symhacks.h>
-#include <openssl/types.h>
+#include <openssl/ossl_typ.h>
 
 #ifdef  __cplusplus
 extern "C" {

diff --git a/crypto/rand/rand.h b/crypto/rand/rand.h
index 30e39c3545737e7a28f081be2de00ce784561141..e17aa7a9f731fbcaa5f4d17867414e3081c182f0 100644 (file)
--- a/crypto/rand/rand.h
+++ b/crypto/rand/rand.h
@@ -60,7 +60,7 @@
 #define HEADER_RAND_H
 
 #include <stdlib.h>
-#include <openssl/types.h>
+#include <openssl/ossl_typ.h>
 
 #ifdef  __cplusplus
 extern "C" {

diff --git a/crypto/rsa/rsa.h b/crypto/rsa/rsa.h
index 459dba08b154b3d8905ba3e068b93fac5010b299..47d12c9e8d29239ed8788de307407e415f2436a0 100644 (file)
--- a/crypto/rsa/rsa.h
+++ b/crypto/rsa/rsa.h
@@ -66,7 +66,7 @@
 #endif
 #include <openssl/bn.h>
 #include <openssl/crypto.h>
-#include <openssl/types.h>
+#include <openssl/ossl_typ.h>
 
 #ifdef OPENSSL_NO_RSA
 #error RSA is disabled.

diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h
index f1040ac7b7cebb4a4d8ee50cc34decccc8919e02..9a4b0db4356c4c31661a4da5127489621b13f403 100644 (file)
--- a/crypto/x509/x509.h
+++ b/crypto/x509/x509.h
@@ -89,7 +89,7 @@
 #endif
 #include <openssl/evp.h>
 #include <openssl/e_os2.h>
-#include <openssl/types.h>
+#include <openssl/ossl_typ.h>
 
 #ifdef  __cplusplus
 extern "C" {