From 16453005bb8373d7228262bf79c5882f311380e9 Mon Sep 17 00:00:00 2001 From: Anchor Date: Thu, 6 Jun 2019 01:51:38 -0700 Subject: [DRTVWR-476] - update cef, fix merge --- indra/llcommon/llfasttimer.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/llcommon/llfasttimer.h') diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h index d463fc9d65..5628a05b00 100644 --- a/indra/llcommon/llfasttimer.h +++ b/indra/llcommon/llfasttimer.h @@ -31,6 +31,10 @@ #include "lltrace.h" #include "lltreeiterators.h" +#if LL_WINDOWS +#include +#endif + #define LL_FAST_TIMER_ON 1 #define LL_FASTTIMER_USE_RDTSC 1 @@ -85,6 +89,8 @@ public: // return __rdtsc(); //} + + // shift off lower 8 bits for lower resolution but longer term timing // on 1Ghz machine, a 32-bit word will hold ~1000 seconds of timing #if LL_FASTTIMER_USE_RDTSC -- cgit v1.2.3