diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-06-11 14:10:13 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-06-11 14:10:13 +0300 |
| commit | c757446ac7218b4216ff97b5aaceb91f77eb1ca7 (patch) | |
| tree | 38826509ad69b0c696556d08daa16513c311dfb5 /indra/llcommon | |
| parent | 53fcb0927539c224a9c078605f9a1164acbb5f53 (diff) | |
| parent | fc6d238884f06951a413004b46569304a9d9280a (diff) | |
Merge from default branch
--HG--
branch : product-engine
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" |