diff options
| author | Richard Levitte <levitte@openssl.org> | 2002-10-09 15:36:35 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2002-10-09 15:36:35 +0000 |
| commit | b61cd4fff2b690320cb36cf4263a63790af2bd2f (patch) | |
| tree | f9abe3080a288d5bb13c66077184385ccce31d59 | |
| parent | dd2b7b5c128a610cf5c24d9279ec00684f9644d6 (diff) | |
| download | openssl-b61cd4fff2b690320cb36cf4263a63790af2bd2f.tar.gz | |
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
| -rw-r--r-- | apps/apps.h | 2 | ||||
| -rw-r--r-- | apps/openssl.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/apps/apps.h b/apps/apps.h index 82587b9770..1c6956a288 100644 --- 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 24450ddb71..55af53f3e2 100644 --- 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 |