diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-12-20 15:09:15 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-12-20 15:09:15 -0600 |
| commit | e9d21ba941a52665d7ad2ee3483c6ac7b7ec6486 (patch) | |
| tree | 0773e70c768caea4a3f68ba67339afadce3e8cbb | |
| parent | fa17e848a63c6eb2837ad064ae1f4d85e117b702 (diff) | |
Fix for windows build. Reviewed by Nyx.
| -rw-r--r-- | indra/llmath/llsimdmath.h | 2 | ||||
| -rw-r--r-- | indra/llmath/llvolume.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/indra/llmath/llsimdmath.h b/indra/llmath/llsimdmath.h index b6ac5190a7..c7cdf7b32c 100644 --- a/indra/llmath/llsimdmath.h +++ b/indra/llmath/llsimdmath.h @@ -35,7 +35,9 @@ #error SSE2 not enabled. LLVector4a and related class will not compile. #endif +#if !LL_WINDOWS #include <stdint.h> +#endif template <typename T> T* LL_NEXT_ALIGNED_ADDRESS(T* address) { diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index c0b50b606e..8a7b19800c 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -29,7 +29,9 @@ #include "llmath.h" #include <set> +#if !LL_WINDOWS #include <stdint.h> +#endif #include "llerror.h" #include "llmemtype.h" |