diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-25 13:49:13 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-25 13:49:13 -0800 |
| commit | 2375afc4283e47a50516c1e003a6f699b0a2cfe1 (patch) | |
| tree | 8805e7c5f87e022ddf27c3a23f626eac9ab987f9 | |
| parent | 18bdeb3d0e5ef4e5b014b41a8003569061e00910 (diff) | |
Gosh, the mac prototypes for get_cpu_clock_count_64 have always been wrong, but the compiler didn't start caring until I made these proper member functions.
fixed.
| -rw-r--r-- | indra/llcommon/llfasttimer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h index 9f9e2ea945..32f3561616 100644 --- a/indra/llcommon/llfasttimer.h +++ b/indra/llcommon/llfasttimer.h @@ -137,7 +137,7 @@ inline U32 LLFastTimer::getCPUClockCount32() return (U32)x >> 8; } -inline U32 LLFastTimer::getCPUClockCount64() +inline U64 LLFastTimer::getCPUClockCount64() { U64 x; __asm__ volatile (".byte 0x0f, 0x31": "=A"(x)); @@ -157,7 +157,7 @@ inline U32 LLFastTimer::getCPUClockCount32() return (U32)get_clock_count(); } -inline U32 LLFastTimer::getCPUClockCount64() +inline U64 LLFastTimer::getCPUClockCount64() { return get_clock_count(); } |