diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2021-11-23 10:09:26 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2021-11-23 10:09:26 -0500 |
| commit | 3b8fc6b9b1232ea8cf224805c12f16e7997f21c5 (patch) | |
| tree | 166a84f24a7a588203790762f913844f62e3d624 /indra/llcommon/llpreprocessor.h | |
| parent | a32a45163d18f9b5998e469a356f870dbdb034ad (diff) | |
| parent | a33718ee4ca4edbbc4c4034b29ec4c8d102f3a7e (diff) | |
SL-16094: Merge llstring work from SL-16207
Diffstat (limited to 'indra/llcommon/llpreprocessor.h')
| -rw-r--r-- | indra/llcommon/llpreprocessor.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h index b17a8e761a..dc586b0008 100644 --- a/indra/llcommon/llpreprocessor.h +++ b/indra/llcommon/llpreprocessor.h @@ -171,7 +171,9 @@ #define LL_DLLIMPORT #endif // LL_WINDOWS -#if ! defined(LL_WINDOWS) +#if __clang__ || ! defined(LL_WINDOWS) +// Only on Windows, and only with the Microsoft compiler (vs. clang) is +// wchar_t potentially not a distinct type. #define LL_WCHAR_T_NATIVE 1 #else // LL_WINDOWS // https://docs.microsoft.com/en-us/cpp/preprocessor/predefined-macros |