--- np2/sound/vermouth/midvoice.c	2006/12/16 12:11:07	1.4
+++ np2/sound/vermouth/midvoice.c	2011/01/15 18:04:43	1.6
@@ -10,12 +10,12 @@
 #define RESAMPLING(d, s, p) {									\
 	int		dat1;												\
 	int		dat2;												\
-	int		div;												\
+	int		_div;												\
 	dat1 = (s)[(p) >> FREQ_SHIFT];								\
-	div = (p) & FREQ_MASK;										\
-	if (div) {													\
+	_div = (p) & FREQ_MASK;										\
+	if (_div) {													\
 		dat2 = (s)[((p) >> FREQ_SHIFT) + 1];					\
-		dat1 += ((dat2 - dat1) * div) >> FREQ_SHIFT;			\
+		dat1 += ((dat2 - dat1) * _div) >> FREQ_SHIFT;			\
 	}															\
 	*(d) = (_SAMPLE)dat1;										\
 }
@@ -96,7 +96,7 @@ static SAMPLE VERMOUTHCL resample_vibrat
 		} while(dstbreak < dstterm);
 		v->sampstep = step;
 	}
-	v->vibrate.count = cnt - (dstterm - dst);
+	v->vibrate.count = cnt - (int)(dstterm - dst);
 	do {
 		RESAMPLING(dst, src, pos);
 		dst++;
@@ -149,7 +149,7 @@ static SAMPLE VERMOUTHCL resample_vibloo
 		} while(dstbreak < dstterm);
 		v->sampstep = step;
 	}
-	v->vibrate.count = cnt - (dstterm - dst);
+	v->vibrate.count = cnt - (int)(dstterm - dst);
 	do {
 		RESAMPLING(dst, src, pos);
 		dst++;
@@ -215,7 +215,7 @@ rr_forward1:;
 			dstbreak += cnt;
 		} while(dstbreak < dstterm);
 	}
-	v->vibrate.count = cnt - (dstterm - dst);
+	v->vibrate.count = cnt - (int)(dstterm - dst);
 	do {
 		RESAMPLING(dst, src, pos);
 		dst++;
@@ -248,7 +248,7 @@ rr_backward1:;
 			dstbreak += cnt;
 		} while(dstbreak < dstterm);
 	}
-	v->vibrate.count = cnt - (dstterm - dst);
+	v->vibrate.count = cnt - (int)(dstterm - dst);
 	do {
 		RESAMPLING(dst, src, pos);
 		dst++;
@@ -529,7 +529,7 @@ static void VERMOUTHCL mixrel_normal(VOI
 	SINT32	relr;
 	_SAMPLE	s;
 
-	samples = srcterm - src;
+	samples = (int)(srcterm - src);
 	voll = v->envleft << RELBIT;
 	rell = -(voll / samples);
 	if (!rell) {
@@ -562,7 +562,7 @@ static void VERMOUTHCL mixrel_left(VOICE
 	_SAMPLE	s;
 
 	vol = v->envleft << RELBIT;
-	rel = - (vol / (srcterm - src));
+	rel = - (vol / (int)(srcterm - src));
 	if (!rel) {
 		rel = -1;
 	}
@@ -592,7 +592,7 @@ static void VERMOUTHCL mixrel_centre(VOI
 	SINT32	d;
 
 	vol = v->envleft << RELBIT;
-	rel = - (vol / (srcterm - src));
+	rel = - (vol / (int)(srcterm - src));
 	if (!rel) {
 		rel = -1;
 	}
@@ -715,7 +715,7 @@ static void VERMOUTHCL mixenv_normal(VOI
 		} while(srcbreak < srcterm);
 	}
 
-	v->envcount = cnt - (srcterm - src);
+	v->envcount = cnt - (int)(srcterm - src);
 	do {
 		s = *src++;
 		dst[0] += SAMPMULVOL(s, voll);
@@ -758,7 +758,7 @@ static void VERMOUTHCL mixenv_left(VOICE
 		} while(srcbreak < srcterm);
 	}
 
-	v->envcount = cnt - (srcterm - src);
+	v->envcount = cnt - (int)(srcterm - src);
 	do {
 		s = *src++;
 		dst[0] += SAMPMULVOL(s, vol);
@@ -809,7 +809,7 @@ static void VERMOUTHCL mixenv_centre(VOI
 		} while(srcbreak < srcterm);
 	}
 
-	v->envcount = cnt - (srcterm - src);
+	v->envcount = cnt - (int)(srcterm - src);
 	do {
 		s = *src++;
 		d = SAMPMULVOL(s, vol);