diff options
| author | callum <none@none> | 2010-06-10 16:58:02 -0700 |
|---|---|---|
| committer | callum <none@none> | 2010-06-10 16:58:02 -0700 |
| commit | fc6d238884f06951a413004b46569304a9d9280a (patch) | |
| tree | 106a4f3e8a3b011d34a97b215070d5cd0a96c069 /indra/llcommon | |
| parent | 63577b8fe3f2b46da70e373364028ae45faf4e06 (diff) | |
| parent | 1065cce5e9db1bd18c2b485024ad360e48cedee2 (diff) | |
Default merge
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..d3ba215751 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" |