From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 22 Feb 2002 21:27:47 +0000 (+0000)
Subject: non-Monolith fixes.
X-Git-Tag: OpenSSL_0_9_7-beta1~202
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cfe1c195c47bed5cd5d5192297813b98b541631a;p=oweals%2Fopenssl.git

non-Monolith fixes.

Submitted by Andrew W. Gray <agray@iconsinc.com>
---

diff --git a/apps/apps.h b/apps/apps.h
index aad2862123..24aa447117 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -121,6 +121,7 @@
 #include <openssl/lhash.h>
 #include <openssl/conf.h>
 #include <openssl/txt_db.h>
+#include <openssl/engine.h>
 #include <openssl/ossl_typ.h>
 
 int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn);
diff --git a/apps/req.c b/apps/req.c
index 2ec2864005..b986dae339 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -177,6 +177,7 @@ int MAIN(int argc, char **argv)
 	unsigned long chtype = MBSTRING_ASC;
 #ifndef MONOLITH
 	MS_STATIC char config_name[256];
+	long errline;
 #endif
 
 	req_conf = NULL;
@@ -472,7 +473,7 @@ bad:
 		}
 	default_config_file=p;
 	config=NCONF_new(NULL);
-	i=NCONF_load(config, p);
+	i=NCONF_load(config, p, &errline);
 #endif
 
 	if (template != NULL)
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 0592e6c2a8..7d6b53eed1 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -111,7 +111,7 @@
 
 #define _XOPEN_SOURCE 600	/* Or gethostname won't be declared properly
 				   on Linux and GNU platforms. */
-#define _XOPEN_SOURCE_EXTENDED	/* Or gethostname won't be declared properly
+#define _XOPEN_SOURCE_EXTENDED	1 /* Or gethostname won't be declared properly
 				   on Compaq platforms (at least with DEC C).
 				*/