diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-07-23 19:21:30 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-07-23 19:21:30 +0000 |
| commit | 6fbf39f9b319106e39f80b8641acaba122d02e0a (patch) | |
| tree | e47af1ff1bd1db52fd93c11d857b11387bacf01a /indra/llcommon/llpreprocessor.h | |
| parent | 05200cf827d9a6263adc4905bf41a4905bce2659 (diff) | |
| parent | 64a9ad0f5f52dac633a76e39335a7def2573b82e (diff) | |
Merged in lmr4-merge-6.4.6 (pull request #213)
Merge master v6.4.6 into DRTVWR-497 (VS2017)
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 |