diff options
| author | richard <none@none> | 2010-01-13 18:17:30 -0800 |
|---|---|---|
| committer | richard <none@none> | 2010-01-13 18:17:30 -0800 |
| commit | faae541261f4e606fd1b90927818bd9239700635 (patch) | |
| tree | 9a8989bd199045ec0fa5ed46fa1e0ec1ad5a9d72 | |
| parent | f036c0c0c41f8f8e3fe22e08ff4e04626d69a64c (diff) | |
| parent | 6da4746d5c5af7863995c0930f99946aedd6bb0f (diff) | |
merge
| -rw-r--r-- | indra/llcommon/llfasttimer.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h index 645bbb88ff..5058a2e772 100644 --- a/indra/llcommon/llfasttimer.h +++ b/indra/llcommon/llfasttimer.h @@ -39,7 +39,13 @@ #define TIME_FAST_TIMERS 0 #if LL_WINDOWS +// 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 |