--- parser3/src/main/pa_globals.C 2016/05/24 11:01:19 1.195 +++ parser3/src/main/pa_globals.C 2016/09/21 15:07:34 1.197 @@ -21,13 +21,14 @@ extern "C" { #include "pa_threads.h" #include "pa_xml_io.h" #include "pa_common.h" +#include "pa_symbols.h" #include "pa_cache_managers.h" #include "ltdl.h" #include "pcre.h" -volatile const char * IDENT_PA_GLOBALS_C="$Id: pa_globals.C,v 1.195 2016/05/24 11:01:19 moko Exp $" IDENT_PA_GLOBALS_H IDENT_PA_SAPI_H; +volatile const char * IDENT_PA_GLOBALS_C="$Id: pa_globals.C,v 1.197 2016/09/21 15:07:34 moko Exp $" IDENT_PA_GLOBALS_H IDENT_PA_SAPI_H; // defines @@ -234,13 +235,17 @@ void pa_globals_init() { // global variables cache_managers=new Cache_managers; - // in various libraries gc_substitute_memory_management_functions(); // hex value setup_hex_value(); +#ifdef SYMBOLS_CACHING + // symbols cache + Symbols::init(); +#endif + #ifdef XML // initializing xml libs @@ -351,4 +356,10 @@ void pa_dlinit() { #endif // XML +// defines for VS2015 to link with gc/xml libs compiled in the previous VS versions +#if _MSC_VER >= 1900 +#pragma comment(lib,"legacy_stdio_definitions.lib") +extern "C" { FILE _iob[3] = { *stdin, *stdout, *stderr }; } +#endif + #endif // _MSC_VER