summaryrefslogtreecommitdiff
path: root/indra/llmath
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-12-21 10:38:08 -0500
committerLoren Shih <seraph@lindenlab.com>2010-12-21 10:38:08 -0500
commite0d77c277a46fa1161505a177e99b456854a98fd (patch)
tree9c0bb28f90368e34fb907950ca54b94df85b5fa2 /indra/llmath
parentc87142e5d779fb3d5375842658a63a1af2573094 (diff)
parente7f3f3bdbbec310030209e09d389cd434adb7991 (diff)
Automated merge from mesh-development
Diffstat (limited to 'indra/llmath')
-rw-r--r--indra/llmath/llsimdmath.h2
-rw-r--r--indra/llmath/llvolume.cpp2
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"