summaryrefslogtreecommitdiff
path: root/crypto/err
diff options
context:
space:
mode:
authorGeoff Thorpe <geoff@openssl.org>2004-04-19 17:46:04 +0000
committerGeoff Thorpe <geoff@openssl.org>2004-04-19 17:46:04 +0000
commit3a87a9b9db07f8d3c6d9aa7f20e01f053007a703 (patch)
tree543949ed3523920985fe649a5ebe3945c8112391 /crypto/err
parentae44fc1ec4c0d6c125c28f52dc06e9ae87c59c4c (diff)
downloadopenssl-new-3a87a9b9db07f8d3c6d9aa7f20e01f053007a703.tar.gz
Reduce header interdependencies, initially in engine.h (the rest of the
changes are the fallout). As this could break source code that doesn't directly include headers for interfaces it uses, changes to recursive includes are covered by the OPENSSL_NO_DEPRECATED symbol. It's better to define this when building and using openssl, and then adapt code where necessary - this is how to stay current. However the mechanism exists for the lethargic.
Diffstat (limited to 'crypto/err')
-rw-r--r--crypto/err/err.h5
-rw-r--r--crypto/err/err_all.c1
2 files changed, 4 insertions, 2 deletions
diff --git a/crypto/err/err.h b/crypto/err/err.h
index d893f60bb7..b723cd977a 100644
--- a/crypto/err/err.h
+++ b/crypto/err/err.h
@@ -66,6 +66,7 @@
#include <stdlib.h>
#endif
+#include <openssl/ossl_typ.h>
#ifndef OPENSSL_NO_BIO
#include <openssl/bio.h>
#endif
@@ -301,8 +302,8 @@ int ERR_get_next_error_library(void);
int ERR_set_mark(void);
int ERR_pop_to_mark(void);
-/* This opaque type encapsulates the low-level error-state functions */
-typedef struct st_ERR_FNS ERR_FNS;
+/* Already defined in ossl_typ.h */
+/* typedef struct st_ERR_FNS ERR_FNS; */
/* An application can use this function and provide the return value to loaded
* modules that should use the application's ERR state/functionality */
const ERR_FNS *ERR_get_implementation(void);
diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c
index 6da4326b2a..bfb4c1ab12 100644
--- a/crypto/err/err_all.c
+++ b/crypto/err/err_all.c
@@ -91,6 +91,7 @@
#ifndef OPENSSL_NO_ENGINE
#include <openssl/engine.h>
#endif
+#include <openssl/ui.h>
#include <openssl/ocsp.h>
#include <openssl/err.h>