diff --git a/indra/cwdebug/debug.cc b/indra/cwdebug/debug.cc
index 34ce73738..18b51aad0 100644
--- a/indra/cwdebug/debug.cc
+++ b/indra/cwdebug/debug.cc
@@ -421,7 +421,7 @@ namespace debug
 {
 
 libcwd_do_type const libcw_do;
-AI_THREADLOCAL int Indent::S_indentation;
+CWD_TLS int Indent::S_indentation;
 
 std::ostream& operator<<(std::ostream& os, Indent::print_nt)
 {
diff --git a/indra/cwdebug/debug.h b/indra/cwdebug/debug.h
index e20ddda77..d49a61512 100644
--- a/indra/cwdebug/debug.h
+++ b/indra/cwdebug/debug.h
@@ -58,9 +58,11 @@
 #include <string>
 
 #if LL_WINDOWS
-#define AI_THREADLOCAL __declspec(thread)
+#define CWD_API_TLS __declspec(thread)
+#define CWD_TLS __declspec(thread)
 #else
-#define AI_THREADLOCAL __thread
+#define CWD_API_TLS CWD_API __thread
+#define CWD_TLS __thread
 #endif
 
 namespace debug {
@@ -81,7 +83,7 @@ struct libcwd_do_type {
 extern CWD_API libcwd_do_type const libcw_do;
 struct Indent {
   int M_indent;
-  static AI_THREADLOCAL int S_indentation;
+  static CWD_API_TLS int S_indentation;
   enum CWD_API print_nt { print };
   CWD_API Indent(int indent) : M_indent(indent) { S_indentation += M_indent; }
   CWD_API ~Indent() { S_indentation -= M_indent; }