You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by fa...@apache.org on 2008/11/13 19:20:15 UTC
svn commit: r713771 - /stdcxx/branches/4.3.x/include/rw/_config.h
Author: faridz
Date: Thu Nov 13 10:20:15 2008
New Revision: 713771
URL: http://svn.apache.org/viewvc?rev=713771&view=rev
Log:
2008-11-13 Farid Zaripov <fa...@apache.org>
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/branches/4.3.x/include/rw/_config.h
Modified: stdcxx/branches/4.3.x/include/rw/_config.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_config.h?rev=713771&r1=713770&r2=713771&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_config.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_config.h Thu Nov 13 10:20:15 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