diff options
| author | richard <none@none> | 2010-01-13 17:48:49 -0800 |
|---|---|---|
| committer | richard <none@none> | 2010-01-13 17:48:49 -0800 |
| commit | 6da4746d5c5af7863995c0930f99946aedd6bb0f (patch) | |
| tree | 7a94d19d5f8ba0bdc6b626009ae3ce80af3646cf /indra | |
| parent | ab1ec1285dba150e4933190a4bcb6ced191f6c5e (diff) | |
better commented fix for VS2005 compile issues
reviewed by Leyla
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/llfasttimer.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h index 7e3c411758..5058a2e772 100644 --- a/indra/llcommon/llfasttimer.h +++ b/indra/llcommon/llfasttimer.h @@ -39,9 +39,13 @@ #define TIME_FAST_TIMERS 0 #if LL_WINDOWS -#define _interlockedbittestandset _dummy_func +// because MS has different signatures for these functions in winnt.h +// need to rename them to avoid conflicts +#define _interlockedbittestandset _renamed_interlockedbittestandset +#define _interlockedbittestandreset _renamed_interlockedbittestandreset #include <intrin.h> #undef _interlockedbittestandset +#undef _interlockedbittestandreset #define LL_INLINE __forceinline // shift off lower 8 bits for lower resolution but longer term timing |