X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=libs%2Foldmik%2Fsrc%2Fvirtch.c;h=6a05cac7d1936e873f95e3eb7774d567d8d5eaa0;hb=0165ec15f868a16a70b56ada2d42db0cb69ea193;hp=8f7e35776350208eb29b41943b413390e14e7157;hpb=77db1ca18d5446dcda9e524261399b63c2cd1813;p=dosdemo

diff --git a/libs/oldmik/src/virtch.c b/libs/oldmik/src/virtch.c
index 8f7e357..6a05cac 100644
--- a/libs/oldmik/src/virtch.c
+++ b/libs/oldmik/src/virtch.c
@@ -73,6 +73,11 @@ extern "C" {
 
 UWORD lvolsel,rvolsel;
 
+#if __WATCOMC__ >= 1200 /* OpenWatcom 1.0+ */
+#define AsmStereoNormal _AsmStereoNormal
+#define AsmMonoNormal _AsmMonoNormal
+#endif
+
 void AsmStereoNormal(SBYTE *srce,SLONG *dest,SLONG index,SLONG increment,ULONG todo);
 #pragma aux AsmStereoNormal	\
 		parm [esi] [edi] [ebx] [ecx] [edx] \
@@ -180,10 +185,10 @@ static SLONG lvolmul,rvolmul;
 static void VC_Sample32To8Copy(SLONG *srce,SBYTE *dest,ULONG count,UBYTE shift)
 {
 	SLONG c;
-	int shift=(24-ampshift);
+	int fooshift=(24-ampshift);
 
 	while(count--){
-		c=*srce >> shift;
+		c=*srce >> fooshift;
 		if(c>127) c=127;
 		else if(c<-128) c=-128;
 		*dest++=c+128;
@@ -195,10 +200,10 @@ static void VC_Sample32To8Copy(SLONG *srce,SBYTE *dest,ULONG count,UBYTE shift)
 static void VC_Sample32To16Copy(SLONG *srce,SWORD *dest,ULONG count,UBYTE shift)
 {
 	SLONG c;
-	int shift=(16-ampshift);
+	int fooshift=(16-ampshift);
 
 	while(count--){
-		c=*srce >> shift;
+		c=*srce >> fooshift;
 		if(c>32767) c=32767;
 		else if(c<-32768) c=-32768;
 		*dest++=c;