diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-09-15 20:35:45 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-09-15 20:35:45 +0000 |
| commit | c09532ac13a3ca2f1ca0854cf00594a26ddcb593 (patch) | |
| tree | 3b0b1e87724c1b2ff14ae52c106be22266195608 /indra/llcommon/linden_common.h | |
| parent | a1a9c02148d8d0537b3736365d4d46b09d9891d2 (diff) | |
| parent | e6ae2400f3427049020cbf4fb25f7ece841f5586 (diff) | |
Merged in merge-541 (pull request #686)
Merge to latest 541
Diffstat (limited to 'indra/llcommon/linden_common.h')
| -rw-r--r-- | indra/llcommon/linden_common.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llcommon/linden_common.h b/indra/llcommon/linden_common.h index 45ac43910c..b2c5be6b76 100644 --- a/indra/llcommon/linden_common.h +++ b/indra/llcommon/linden_common.h @@ -27,6 +27,14 @@ #ifndef LL_LINDEN_COMMON_H #define LL_LINDEN_COMMON_H +#include "llprofiler.h" +#if (TRACY_ENABLE) // hooks for memory profiling +void *tracy_aligned_malloc(size_t size, size_t alignment); +void tracy_aligned_free(void *memblock); +#define _aligned_malloc(X, Y) tracy_aligned_malloc((X), (Y)) +#define _aligned_free(X) tracy_aligned_free((X)) +#endif + // *NOTE: Please keep includes here to a minimum! // // Files included here are included in every library .cpp file and |