Make sure that the 'config' variable is correctly defined and declared

for monolithic as well as non-monolithic biuld.
More work is probably needed in this area.
PR: 144

diff --git a/apps/apps.h b/apps/apps.h
index 82587b977056c9ef64918c0211ca0c64f9088350..1c6956a2882cd49589da8b088557ec85500cfd4a 100644 (file)
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -92,8 +92,10 @@ int WIN32_rename(char *oldname,char *newname);
 #define MAIN(a,v)      main(a,v)
 
 #ifndef NON_MAIN
+LHASH *config=NULL;
 BIO *bio_err=NULL;
 #else
+extern LHASH *config;
 extern BIO *bio_err;
 #endif
 

diff --git a/apps/openssl.c b/apps/openssl.c
index 24450ddb71f4b6408c55f11af02d7183c9c78e11..55af53f3e2b52e0e6b759d7309e0b1f933a4b72d 100644 (file)
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -77,11 +77,11 @@ static unsigned long MS_CALLBACK hash(FUNCTION *a);
 static int MS_CALLBACK cmp(FUNCTION *a,FUNCTION *b);
 static LHASH *prog_init(void );
 static int do_cmd(LHASH *prog,int argc,char *argv[]);
-LHASH *config=NULL;
 char *default_config_file=NULL;
 
 /* Make sure there is only one when MONOLITH is defined */
 #ifdef MONOLITH
+LHASH *config=NULL;
 BIO *bio_err=NULL;
 #endif