From ab1ec1285dba150e4933190a4bcb6ced191f6c5e Mon Sep 17 00:00:00 2001 From: richard Date: Wed, 13 Jan 2010 17:33:27 -0800 Subject: potential fix for build issues on vs2005 --- indra/llcommon/llfasttimer.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h index 645bbb88ff..7e3c411758 100644 --- a/indra/llcommon/llfasttimer.h +++ b/indra/llcommon/llfasttimer.h @@ -39,7 +39,9 @@ #define TIME_FAST_TIMERS 0 #if LL_WINDOWS +#define _interlockedbittestandset _dummy_func #include +#undef _interlockedbittestandset #define LL_INLINE __forceinline // shift off lower 8 bits for lower resolution but longer term timing -- cgit v1.3 From 6da4746d5c5af7863995c0930f99946aedd6bb0f Mon Sep 17 00:00:00 2001 From: richard Date: Wed, 13 Jan 2010 17:48:49 -0800 Subject: better commented fix for VS2005 compile issues reviewed by Leyla --- indra/llcommon/llfasttimer.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 #undef _interlockedbittestandset +#undef _interlockedbittestandreset #define LL_INLINE __forceinline // shift off lower 8 bits for lower resolution but longer term timing -- cgit v1.3