summaryrefslogtreecommitdiffstats
path: root/ssl/ssl_locl.h
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2016-03-18 14:30:20 -0400
committerRich Salz <rsalz@openssl.org>2016-03-20 19:48:36 -0400
commit3c27208fab1dc29f47f088490404df5abfcdfb05 (patch)
tree3654ea8c099e19203a48ce2688aeee02f46fd12b /ssl/ssl_locl.h
parent8230f6c764f854190358cf40f0e7e7ca5647d8cd (diff)
Remove #error from include files.
Don't have #error statements in header files, but instead wrap the contents of that file in #ifndef OPENSSL_NO_xxx This means it is now always safe to include the header file. Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl/ssl_locl.h')
-rw-r--r--ssl/ssl_locl.h16
1 files changed, 4 insertions, 12 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index fa0254c809..4abe7b425f 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -149,24 +149,16 @@
# include "e_os.h"
# include <openssl/buffer.h>
-# ifndef OPENSSL_NO_COMP
-# include <openssl/comp.h>
-# endif
+# include <openssl/comp.h>
# include <openssl/bio.h>
# include <openssl/stack.h>
-# ifndef OPENSSL_NO_RSA
-# include <openssl/rsa.h>
-# endif
-# ifndef OPENSSL_NO_DSA
-# include <openssl/dsa.h>
-# endif
+# include <openssl/rsa.h>
+# include <openssl/dsa.h>
# include <openssl/err.h>
# include <openssl/ssl.h>
# include <openssl/async.h>
# include <openssl/symhacks.h>
-# ifndef OPENSSL_NO_CT
-# include <openssl/ct.h>
-# endif
+# include <openssl/ct.h>
#include "record/record.h"
#include "statem/statem.h"
#include "packet_locl.h"