aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteriAimonen <PetteriAimonen@d3e1167c-abe1-51d5-8199-f9061ebe54e4>2014-01-16 06:21:59 +0000
committerPetteriAimonen <PetteriAimonen@d3e1167c-abe1-51d5-8199-f9061ebe54e4>2014-01-16 06:21:59 +0000
commit6758096516b2c68e39cf1b2e2a13a8e9323a7ca5 (patch)
treeff8af1f54c3d9bf15fd03e5e83485221ed01211d
parent66dcaddf688f7ce382f86c71e1bc7a0074102cc1 (diff)
Fix errors on Visual Studio (patch by sunside227)
-rw-r--r--libfixmath/fix16_sqrt.c2
-rw-r--r--libfixmath/fract32.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libfixmath/fix16_sqrt.c b/libfixmath/fix16_sqrt.c
index abf57f7..71b9f0c 100644
--- a/libfixmath/fix16_sqrt.c
+++ b/libfixmath/fix16_sqrt.c
@@ -80,5 +80,5 @@ fix16_t fix16_sqrt(fix16_t inValue)
}
#endif
- return (neg ? -result : result);
+ return (neg ? -(fix16_t)result : result);
}
diff --git a/libfixmath/fract32.c b/libfixmath/fract32.c
index 397e000..cca94a7 100644
--- a/libfixmath/fract32.c
+++ b/libfixmath/fract32.c
@@ -21,7 +21,7 @@ uint32_t fract32_usmul(uint32_t inVal, fract32_t inFract) {
int32_t fract32_smul(int32_t inVal, fract32_t inFract) {
if(inVal < 0)
- return -fract32_usmul(-inVal, inFract);
+ return -(int32_t)fract32_usmul(-inVal, inFract);
return fract32_usmul(inVal, inFract);
}
#endif