From 3811815c05656cebaa5a63456d1f84e0119b96a5 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Thu, 10 Jun 2010 14:13:51 -0700
Subject: llintrin.h include compile fix for building with windows sdk crafted
 by richard

---
 indra/llcommon/llprocessor.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp
index 98c9eabcd6..9ed7ed1cf1 100644
--- a/indra/llcommon/llprocessor.cpp
+++ b/indra/llcommon/llprocessor.cpp
@@ -41,7 +41,11 @@
 #	define WIN32_LEAN_AND_MEAN
 #	include <winsock2.h>
 #	include <windows.h>
-#   include <intrin.h>
+#	define _interlockedbittestandset _renamed_interlockedbittestandset
+#	define _interlockedbittestandreset _renamed_interlockedbittestandreset
+#	include <intrin.h>
+#	undef _interlockedbittestandset
+#	undef _interlockedbittestandreset
 #endif
 
 #include "llsd.h"
-- 
cgit v1.2.3