diff options
| author | Richard Linden <none@none> | 2014-03-24 19:23:34 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2014-03-24 19:23:34 -0700 |
| commit | e5bbdafdeda0f2e6bbe97d59a24ca398b54c31eb (patch) | |
| tree | 359719c76abf090fb8cc5ae912ed013b64cb8fc7 /indra/llcommon/llprocess.h | |
| parent | 31a3a3da5db077c4d9b8fe06a18de98c822db6ab (diff) | |
| parent | 5b846ed2a6dce6c5801aa74d0f36a1c7525fbcba (diff) | |
merge with release
Diffstat (limited to 'indra/llcommon/llprocess.h')
| -rwxr-xr-x | indra/llcommon/llprocess.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llprocess.h b/indra/llcommon/llprocess.h index d711ce2f74..43ccadc412 100755 --- a/indra/llcommon/llprocess.h +++ b/indra/llcommon/llprocess.h @@ -29,6 +29,7 @@ #include "llinitparam.h" #include "llsdparam.h" +#include "llwin32headerslean.h" #include "apr_thread_proc.h" #include <boost/shared_ptr.hpp> #include <boost/ptr_container/ptr_vector.hpp> @@ -38,8 +39,7 @@ #include <stdexcept> #if LL_WINDOWS -#define WIN32_LEAN_AND_MEAN -#include <windows.h> // HANDLE (eye roll) +#include "llwin32headerslean.h" // for HANDLE #elif LL_LINUX #if defined(Status) #undef Status |