diff options
| author | Richard Levitte <levitte@openssl.org> | 2001-10-04 07:32:46 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2001-10-04 07:32:46 +0000 |
| commit | 2aa9043ad33776323393f82c8a542d46bdedc34d (patch) | |
| tree | bc5fcc190d351de0fcfe92e33e8cc676889546cd /crypto | |
| parent | 1a095560f79c002ca5bcbac531e12f7e770d8d37 (diff) | |
Because there's chances we clash with the system's types.h, rename our
types.h to ossl_typ.h.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/asn1/asn1.h | 2 | ||||
| -rw-r--r-- | crypto/dh/dh.h | 2 | ||||
| -rw-r--r-- | crypto/dsa/dsa.h | 2 | ||||
| -rw-r--r-- | crypto/engine/engine.h | 3 | ||||
| -rw-r--r-- | crypto/evp/evp.h | 2 | ||||
| -rw-r--r-- | crypto/ossl_typ.h (renamed from crypto/types.h) | 0 | ||||
| -rw-r--r-- | crypto/pkcs7/pkcs7.h | 2 | ||||
| -rw-r--r-- | crypto/rand/rand.h | 2 | ||||
| -rw-r--r-- | crypto/rsa/rsa.h | 2 | ||||
| -rw-r--r-- | crypto/x509/x509.h | 2 |
10 files changed, 9 insertions, 10 deletions
diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h index 279020be61..363070b8ab 100644 --- 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 65d61e2bb7..e9cb99d994 100644 --- 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 9692a0b6ff..dcdd28f94d 100644 --- 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 51c108ec24..782d85a9be 100644 --- 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 494fa0c65e..5022d93dc9 100644 --- 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 index b3aa586b18..b3aa586b18 100644 --- a/crypto/types.h +++ b/crypto/ossl_typ.h diff --git a/crypto/pkcs7/pkcs7.h b/crypto/pkcs7/pkcs7.h index 1dda0c5a58..946596c8d9 100644 --- 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 30e39c3545..e17aa7a9f7 100644 --- 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 459dba08b1..47d12c9e8d 100644 --- 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 f1040ac7b7..9a4b0db435 100644 --- 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" { |