From 6da4746d5c5af7863995c0930f99946aedd6bb0f Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Wed, 13 Jan 2010 17:48:49 -0800
Subject: [PATCH] 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 7e3c411758d..5058a2e772d 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
-- 
GitLab