diff options
| author | Nicky <nicky.dasmijn@gmail.com> | 2022-06-13 20:09:42 +0200 |
|---|---|---|
| committer | Nicky <nicky.dasmijn@gmail.com> | 2022-06-13 20:09:42 +0200 |
| commit | 1b73835d6e80bc64c520a8846aebdbe1b7c9705b (patch) | |
| tree | b972275919bf6c620bbbcb81dd6b12568494561e /indra/llcommon/llpreprocessor.h | |
| parent | 78e069f5e8ef1ee312e709934482b23aa86a69c2 (diff) | |
| parent | c08a61453b21664da3687661512e2ea208f90d98 (diff) | |
Merge branch 'DRTVWR-543-maint_cmake' of bitbucket.org:NickyD/viewer-cmake into DRTVWR-543-maint_cmake
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 |