From 0b86eb3ea66628997a11bc8588c4695eabd90e62 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bodo=20M=C3=B6ller?= Date: Sat, 24 Apr 1999 18:50:40 +0000 Subject: [PATCH] Fix header files so that any one can be included first. Submitted by: Reviewed by: PR: --- crypto/bio/bio.h | 1 + crypto/crypto.h | 4 ++++ crypto/err/err.h | 4 ++++ crypto/lhash/lhash.h | 4 ++++ crypto/x509/x509.h | 1 - crypto/x509/x509_vfy.h | 6 ++++++ ssl/ssl3.h | 2 ++ 7 files changed, 21 insertions(+), 1 deletion(-) diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h index 4f1b3e3e98..1f870909a5 100644 --- a/crypto/bio/bio.h +++ b/crypto/bio/bio.h @@ -63,6 +63,7 @@ extern "C" { #endif +#include #include /* These are the 'types' of BIOs */ diff --git a/crypto/crypto.h b/crypto/crypto.h index 0b35fc3876..0bf74a1655 100644 --- a/crypto/crypto.h +++ b/crypto/crypto.h @@ -63,6 +63,10 @@ extern "C" { #endif +#ifndef NO_FP_API +#include +#endif + #include #include diff --git a/crypto/err/err.h b/crypto/err/err.h index 52202942da..617fce7f83 100644 --- a/crypto/err/err.h +++ b/crypto/err/err.h @@ -63,6 +63,10 @@ extern "C" { #endif +#ifndef NO_FP_API +#include +#endif + /* The following is a bit of a trick to help the object files only contain * the 'name of the file' string once. Since 'err.h' is protected by the * HEADER_ERR_H stuff, this should be included only once per file. */ diff --git a/crypto/lhash/lhash.h b/crypto/lhash/lhash.h index e97d39ffc5..9b1d5ef058 100644 --- a/crypto/lhash/lhash.h +++ b/crypto/lhash/lhash.h @@ -67,6 +67,10 @@ extern "C" { #endif +#ifndef NO_FP_API +#include +#endif + typedef struct lhash_node_st { char *data; diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h index 3853ff61a3..0357487c25 100644 --- a/crypto/x509/x509.h +++ b/crypto/x509/x509.h @@ -1,4 +1,3 @@ - /* crypto/x509/x509.h */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/crypto/x509/x509_vfy.h b/crypto/x509/x509_vfy.h index 41f65f7275..e047637021 100644 --- a/crypto/x509/x509_vfy.h +++ b/crypto/x509/x509_vfy.h @@ -56,6 +56,12 @@ * [including the GNU Public Licence.] */ +#ifndef HEADER_X509_H +#include +/* openssl/x509.h ends up #include-ing this file at about the only + * appropriate moment. */ +#endif + #ifndef HEADER_X509_VFY_H #define HEADER_X509_VFY_H diff --git a/ssl/ssl3.h b/ssl/ssl3.h index 23375f16ea..36f135182b 100644 --- a/ssl/ssl3.h +++ b/ssl/ssl3.h @@ -60,6 +60,8 @@ #define HEADER_SSL3_H #include +#include +#include #ifdef __cplusplus extern "C" { -- 2.25.1