Commit 3c27208f authored by Rich Salz's avatar Rich Salz
Browse files

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: default avatarRichard Levitte <levitte@openssl.org>
parent 8230f6c7

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -4,6 +4,10 @@ 


 Changes between 1.0.2g and 1.1.0  [xx XXX xxxx]



  *) Headers are now wrapped, if necessary, with OPENSSL_NO_xxx, so

     it is always safe to #include a header now.

     [Rich Salz]



  *) Removed the aged BC-32 config and all its supporting scripts

     [Richard Levitte]

apps/apps.h

+2 −6
Original line number Diff line number Diff line
@@ -121,12 +121,8 @@ 
# include <openssl/lhash.h>

# include <openssl/conf.h>

# include <openssl/txt_db.h>

# ifndef OPENSSL_NO_ENGINE

# include <openssl/engine.h>

# endif

# ifndef OPENSSL_NO_OCSP

# include <openssl/ocsp.h>

# endif

# include <openssl/ossl_typ.h>

# include <signal.h>

crypto/aes/aes_locl.h

+0 −5
Original line number Diff line number Diff line
@@ -52,11 +52,6 @@ 
# define HEADER_AES_LOCL_H



# include <openssl/e_os2.h>



# ifdef OPENSSL_NO_AES

#  error AES is disabled.

# endif



# include <stdio.h>

# include <stdlib.h>

# include <string.h>

crypto/asn1/ameth_lib.c

+1 −3
Original line number Diff line number Diff line
@@ -60,9 +60,7 @@ 
#include "internal/cryptlib.h"

#include <openssl/asn1t.h>

#include <openssl/x509.h>

#ifndef OPENSSL_NO_ENGINE

#include <openssl/engine.h>

#endif

#include "internal/asn1_int.h"

#include "internal/evp_int.h"

crypto/asn1/d2i_pr.c

+1 −3
Original line number Diff line number Diff line
@@ -60,9 +60,7 @@ 
#include <openssl/bn.h>

#include <openssl/evp.h>

#include <openssl/objects.h>

#ifndef OPENSSL_NO_ENGINE

#include <openssl/engine.h>

#endif

#include <openssl/x509.h>

#include <openssl/asn1.h>

#include "internal/asn1_int.h"