Author: faridz Date: Thu Nov 13 10:19:25 2008 New Revision: 713770 URL: http://svn.apache.org/viewvc?rev=713770&view=rev Log: 2008-11-13 Farid Zaripov <[EMAIL PROTECTED]>
Merged r713762 from 4.2.x branch. STDCXX-1023 * include/rw/_config.h [_WIN32 && _RWSTD_LIB_SRC]: Disable using of implicit TLS variables in stdcxx library on Windows. Modified: stdcxx/trunk/include/rw/_config.h Modified: stdcxx/trunk/include/rw/_config.h URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/rw/_config.h?rev=713770&r1=713769&r2=713770&view=diff ============================================================================== --- stdcxx/trunk/include/rw/_config.h (original) +++ stdcxx/trunk/include/rw/_config.h Thu Nov 13 10:19:25 2008 @@ -278,6 +278,18 @@ #ifdef _WIN32 # define _RWSTD_NO_STATIC_MUTEX_INIT # define _RWSTD_PATH_SEP '\\' +# ifdef _RWSTD_LIB_SRC + // Don't use implicit TLS in our library on Windows because of the TLS + // might not be initialized when our library DLL or the DLL, that + // linked statically against our library, is loaded explicitly using + // LoadLibrary() function. (STDCXX-1023) +# ifndef _RWSTD_NO_TLS +# define _RWSTD_NO_TLS +# endif +# ifdef _RWSTD_THREAD +# undef _RWSTD_THREAD +# endif +# endif // _RWSTD_LIB_SRC #endif // _WIN32 #ifndef _RWSTD_PATH_SEP