diff options
| author | Kitty Barnett <develop@catznip.com> | 2024-09-17 19:16:25 +0200 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2024-09-17 19:16:25 +0200 |
| commit | 25f8cbece402c0987e2035eb7721e21a9d2761c3 (patch) | |
| tree | f2408e7d1f7b58f49f8cefc5dda7dd56d08c98f8 /indra/llcommon/llprocessor.cpp | |
| parent | 6f4d7c2d6d363aee60d2f3d1fe4ed4a251aaa11b (diff) | |
| parent | f378d2f95ad751ccf7456f79baba61d6c39f5c36 (diff) | |
Merge branch 'develop' into rlva/base
Diffstat (limited to 'indra/llcommon/llprocessor.cpp')
| -rw-r--r-- | indra/llcommon/llprocessor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp index 9d53b9be35..41ff369de2 100644 --- a/indra/llcommon/llprocessor.cpp +++ b/indra/llcommon/llprocessor.cpp @@ -34,7 +34,7 @@ //#include <memory> #if LL_WINDOWS -# include "llwin32headerslean.h" +# include "llwin32headers.h" # define _interlockedbittestandset _renamed_interlockedbittestandset # define _interlockedbittestandreset _renamed_interlockedbittestandreset # include <intrin.h> |