Lots of little fixes for doing MSVC compiling codecs in windows (#6022)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@9450 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 4 insertions, 4 deletions

diff --git a/codecs/gsm/src/add.c b/codecs/gsm/src/add.c
index 21ccfabe7..f23d27f16 100644
--- a/codecs/gsm/src/add.c
+++ b/codecs/gsm/src/add.c
@@ -23,19 +23,19 @@
 word gsm_add P2((a,b), word a, word b)
 {
 	longword sum = (longword)a + (longword)b;
-	return saturate(sum);
+	return (word)saturate(sum);
 }
 
 word gsm_sub P2((a,b), word a, word b)
 {
 	longword diff = (longword)a - (longword)b;
-	return saturate(diff);
+	return (word)saturate(diff);
 }
 
 word gsm_mult P2((a,b), word a, word b)
 {
 	if (a == MIN_WORD && b == MIN_WORD) return MAX_WORD;
-	else return SASR( (longword)a * (longword)b, 15 );
+	else return (word)SASR( (longword)a * (longword)b, 15 );
 }
 
 word gsm_mult_r P2((a,b), word a, word b)
@@ -44,7 +44,7 @@ word gsm_mult_r P2((a,b), word a, word b)
 	else {
 		longword prod = (longword)a * (longword)b + 16384;
 		prod >>= 15;
-		return prod & 0xFFFF;
+		return (word)(prod & 0xFFFF);
 	}
 }