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
This commit is contained in:
		@@ -144,8 +144,10 @@ int WIN32_rename(char *oldname,char *newname);
 | 
				
			|||||||
#define MAIN(a,v)	main(a,v)
 | 
					#define MAIN(a,v)	main(a,v)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifndef NON_MAIN
 | 
					#ifndef NON_MAIN
 | 
				
			||||||
 | 
					CONF *config=NULL;
 | 
				
			||||||
BIO *bio_err=NULL;
 | 
					BIO *bio_err=NULL;
 | 
				
			||||||
#else
 | 
					#else
 | 
				
			||||||
 | 
					extern CONF *config;
 | 
				
			||||||
extern BIO *bio_err;
 | 
					extern BIO *bio_err;
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -139,11 +139,11 @@ static unsigned long MS_CALLBACK hash(const void *a_void);
 | 
				
			|||||||
static int MS_CALLBACK cmp(const void *a_void,const void *b_void);
 | 
					static int MS_CALLBACK cmp(const void *a_void,const void *b_void);
 | 
				
			||||||
static LHASH *prog_init(void );
 | 
					static LHASH *prog_init(void );
 | 
				
			||||||
static int do_cmd(LHASH *prog,int argc,char *argv[]);
 | 
					static int do_cmd(LHASH *prog,int argc,char *argv[]);
 | 
				
			||||||
CONF *config=NULL;
 | 
					 | 
				
			||||||
char *default_config_file=NULL;
 | 
					char *default_config_file=NULL;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Make sure there is only one when MONOLITH is defined */
 | 
					/* Make sure there is only one when MONOLITH is defined */
 | 
				
			||||||
#ifdef MONOLITH
 | 
					#ifdef MONOLITH
 | 
				
			||||||
 | 
					CONF *config=NULL;
 | 
				
			||||||
BIO *bio_err=NULL;
 | 
					BIO *bio_err=NULL;
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user