diff options
| author | Aura Linden <obscurestar> | 2014-12-08 23:13:19 -0800 |
|---|---|---|
| committer | Aura Linden <obscurestar> | 2014-12-08 23:13:19 -0800 |
| commit | 5e2d5cc2e1662ba5d4fa760cc3d874d7357b8dd2 (patch) | |
| tree | 902d32aecaee48a10de3b1fe2e09fd403c66f35d /indra/llcommon/llpreprocessor.h | |
| parent | 161494cf3da4faa3ce1123527b0a1097870f66db (diff) | |
| parent | 0524a4048bd6d4d4bcd12d73e874db9379a0c02a (diff) | |
Merged.
Diffstat (limited to 'indra/llcommon/llpreprocessor.h')
| -rwxr-xr-x | indra/llcommon/llpreprocessor.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h index 309165da7f..2c4bcc91f6 100755 --- a/indra/llcommon/llpreprocessor.h +++ b/indra/llcommon/llpreprocessor.h @@ -101,6 +101,11 @@ #endif +#if LL_WINDOWS +# define LL_THREAD_LOCAL __declspec(thread) +#else +# define LL_THREAD_LOCAL __thread +#endif // Static linking with apr on windows needs to be declared. #if LL_WINDOWS && !LL_COMMON_LINK_SHARED |