Make sure we get the definition of OPENSSL_NO_BIO and OPENSSL_NO_RSA.

diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index 19414444a5c216c81b808acd5cb39c3d0ae0b1ad..790e7b967bf85b97efe6355eb55373c919a04aa2 100644 (file)
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -60,10 +60,10 @@
 #define HEADER_ASN1_H
 
 #include <time.h>
 #define HEADER_ASN1_H
 
 #include <time.h>

+#include <openssl/e_os2.h>

 #ifndef OPENSSL_NO_BIO
 #include <openssl/bio.h>
 #endif
 #ifndef OPENSSL_NO_BIO
 #include <openssl/bio.h>
 #endif

-#include <openssl/e_os2.h>

 #include <openssl/bn.h>
 #include <openssl/stack.h>
 #include <openssl/safestack.h>
 #include <openssl/bn.h>
 #include <openssl/stack.h>
 #include <openssl/safestack.h>

diff --git a/crypto/asn1/n_pkey.c b/crypto/asn1/n_pkey.c
index 766b51c53830e0a1d15f1c08c5f59d6a3b8b1cc6..a5a02e843c1f249c5f4b9d082019783619458627 100644 (file)
--- a/crypto/asn1/n_pkey.c
+++ b/crypto/asn1/n_pkey.c
@@ -56,9 +56,9 @@
  * [including the GNU Public Licence.]
  */
 
  * [including the GNU Public Licence.]
  */
 

-#ifndef OPENSSL_NO_RSA

 #include <stdio.h>
 #include "cryptlib.h"
 #include <stdio.h>
 #include "cryptlib.h"

+#ifndef OPENSSL_NO_RSA

 #include <openssl/rsa.h>
 #include <openssl/objects.h>
 #include <openssl/asn1t.h>
 #include <openssl/rsa.h>
 #include <openssl/objects.h>
 #include <openssl/asn1t.h>