diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-06-10 14:13:51 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-06-10 14:13:51 -0700 |
| commit | 3811815c05656cebaa5a63456d1f84e0119b96a5 (patch) | |
| tree | 9903df9b2693d679dfee2496b652803e85022b4c /indra/llcommon | |
| parent | a37f7ec200963ab97ecd0bc4059ecf4e94fe9232 (diff) | |
llintrin.h include compile fix for building with windows sdk
crafted by richard
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llprocessor.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
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" |