diff options
author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-08-11 00:37:42 +0300 |
---|---|---|
committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-08-11 00:37:42 +0300 |
commit | 1a390cb0dfeed66b3fcf8edd89baf7577e6ee1c5 (patch) | |
tree | 4ed2107c5e2649c26d1c85ffe30c0a56f7a21164 /indra/llcommon/llpreprocessor.h | |
parent | 7a9a114e168ea68345b54e80b3cfbac7deb4764a (diff) | |
parent | 89cde15fb8c52071805af78e61848e743f2ab2f1 (diff) |
Merged master into DRTVWR-482
Diffstat (limited to 'indra/llcommon/llpreprocessor.h')
-rw-r--r-- | indra/llcommon/llpreprocessor.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h index e8f9981437..bae402110a 100644 --- a/indra/llcommon/llpreprocessor.h +++ b/indra/llcommon/llpreprocessor.h @@ -232,4 +232,11 @@ #define LL_COMPILE_TIME_MESSAGE(msg) #endif +// __FUNCTION__ works on all the platforms we care about, but... +#if LL_WINDOWS +#define LL_PRETTY_FUNCTION __FUNCSIG__ +#else +#define LL_PRETTY_FUNCTION __PRETTY_FUNCTION__ +#endif + #endif // not LL_LINDEN_PREPROCESSOR_H |