Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / setup_inc.h

diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h
index f7d6ce80b479229bb516d7316d5d12f4a050611a..712dcca883c429eea23daf3bfaec8b8fd74d41b4 100644 (file)
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -147,7 +147,7 @@
 // In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
 // this causes problems (e.g. link errors), set this to 0. You may need to set
 // this to 0 if using templates (at least for VC++). This switch is currently
 // In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
 // this causes problems (e.g. link errors), set this to 0. You may need to set
 // this to 0 if using templates (at least for VC++). This switch is currently

-// ignored for mingw / cygwin / CodeWarrior
+// ignored for MinGW/Cygwin.

 //
 // Default is 0
 //
 //
 // Default is 0
 //


@@ -263,6 +263,17 @@
 // Recommended setting: 1 if you want to support multiple languages
 #define wxUSE_PRINTF_POS_PARAMS      1
 
 // Recommended setting: 1 if you want to support multiple languages
 #define wxUSE_PRINTF_POS_PARAMS      1
 

+// Enable the use of compiler-specific thread local storage keyword, if any.
+// This is used for wxTLS_XXX() macros implementation and normally should use
+// the compiler-provided support as it's simpler and more efficient, but must
+// not use it if wxWidgets is used in a dynamically loaded Win32 (i.e. using
+// LoadLibrary()/GetProcAddress()) as this triggers a bug in compiler TLS
+// support that results in crashes when any TLS variables are used. So if you
+// are building a Win32 DLL using wxWidgets that can be loaded dynamically, set
+// this to 0.
+//
+// Default is 1, but set to 0 if the scenario above is applicable.
+#define wxUSE_COMPILER_TLS 1

 
 // ----------------------------------------------------------------------------
 // Interoperability with the standard library.
 
 // ----------------------------------------------------------------------------
 // Interoperability with the standard library.