Avoid "incomprehensible" errors when required definitions are missing.

Submitted by:
Reviewed by:
PR:

diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index 15cd421863de12a4d35df776077142f7b74d1b67..8a28085d550a9b8e5a9dbbd6f37a114a82def8f6 100644 (file)
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -679,6 +679,9 @@ char *ASN1_unpack_string(ASN1_STRING *oct, char *(*d2i)());
 ASN1_STRING *ASN1_pack_string(char *obj, int (*i2d)(), ASN1_OCTET_STRING **oct);
 
 #else
+#error "OpenSSL cannot be used with NOPROTO defined.  The NOPROTO sections in header files exist only for automatic parsing by certain utilities."
+/* Without this, highly uncomprehensible error messages can occur
+ * when compiling something with -DNOPROTO ... */
 
 ASN1_TYPE *    ASN1_TYPE_new();
 void           ASN1_TYPE_free();

diff --git a/crypto/bn/bn.h b/crypto/bn/bn.h
index 5d6f9f62035c0d44e3c6a07108f49a4196552ec9..262423fa26f0b6c8a3598a78edad51b4e9584f14 100644 (file)
--- a/crypto/bn/bn.h
+++ b/crypto/bn/bn.h
@@ -59,6 +59,9 @@
 #ifndef HEADER_BN_H
 #define HEADER_BN_H
 
+#ifndef WIN16
+#include <stdio.h> /* FILE */
+#endif
 #include <openssl/opensslconf.h>
 
 #ifdef  __cplusplus