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

types.h to ossl_typ.h.
2001-10-04 07:32:46 +00:00
parent 1a095560f7
commit 2aa9043ad3
11 changed files with 10 additions and 11 deletions
--- 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);
--- 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
--- 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

--- 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
--- 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" {
--- 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>
--- a/crypto/ossl_typ.h
+++ b/crypto/ossl_typ.h
--- 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" {
--- 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" {
--- 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.
--- 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" {