Commit 2aa9043a authored by Richard Levitte's avatar Richard Levitte
Browse files

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

types.h to ossl_typ.h.
parent 1a095560

apps/apps.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

crypto/asn1/asn1.h

+1 −1
Original line number Diff line number Diff line
@@ -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

crypto/dh/dh.h

+1 −1
Original line number Diff line number Diff line
@@ -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

crypto/dsa/dsa.h

+1 −1
Original line number Diff line number Diff line
@@ -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

crypto/engine/engine.h

+1 −2
Original line number Diff line number Diff line
@@ -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" {