From 3811815c05656cebaa5a63456d1f84e0119b96a5 Mon Sep 17 00:00:00 2001 From: Leyla Farazha 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(-) (limited to 'indra/llcommon') 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 # include -# include +# define _interlockedbittestandset _renamed_interlockedbittestandset +# define _interlockedbittestandreset _renamed_interlockedbittestandreset +# include +# undef _interlockedbittestandset +# undef _interlockedbittestandreset #endif #include "llsd.h" -- cgit v1.2.3 From 41bee5cfe8bd0b83fdc93cd1541f3fc82ecb6aab Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Thu, 10 Jun 2010 14:15:06 -0700 Subject: removing windows lind endings --- indra/llcommon/llprocessor.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/llcommon') diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp index 9ed7ed1cf1..d3ba215751 100644 --- a/indra/llcommon/llprocessor.cpp +++ b/indra/llcommon/llprocessor.cpp @@ -41,10 +41,10 @@ # define WIN32_LEAN_AND_MEAN # include # include -# define _interlockedbittestandset _renamed_interlockedbittestandset -# define _interlockedbittestandreset _renamed_interlockedbittestandreset -# include -# undef _interlockedbittestandset +# define _interlockedbittestandset _renamed_interlockedbittestandset +# define _interlockedbittestandreset _renamed_interlockedbittestandreset +# include +# undef _interlockedbittestandset # undef _interlockedbittestandreset #endif -- cgit v1.2.3