From: sparky4 <sparky4@cock.li>
Date: Thu, 22 Sep 2016 19:00:38 +0000 (-0500)
Subject: 16_pm compiles on both compilers wwww
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=8994da7acdc03c5bcea3bcef14368094c45492f8;p=16.git

16_pm compiles on both compilers wwww
---

diff --git a/bcexmm.dsk b/bcexmm.dsk
index 81894b49..5e23aeca 100755
Binary files a/bcexmm.dsk and b/bcexmm.dsk differ
diff --git a/bcexmm.exe b/bcexmm.exe
new file mode 100755
index 00000000..88bb916e
Binary files /dev/null and b/bcexmm.exe differ
diff --git a/bcexmm.prj b/bcexmm.prj
index a9e71b31..410c914e 100755
Binary files a/bcexmm.prj and b/bcexmm.prj differ
diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c
index ea11ac48..139b72c8 100755
--- a/src/lib/16_pm.c
+++ b/src/lib/16_pm.c
@@ -151,8 +151,13 @@ PML_StartupEMS(global_game_variables_t *gvar)
 	__asm {
 		jnc	gothandle
 		mov	errorflag,1
+#ifdef __BORLANDC__
+	}
+#endif
 		gothandle:
+#ifdef __WATCOMC__
 	}
+#endif
 	if(errorflag)
 		goto error;
 
@@ -163,8 +168,13 @@ PML_StartupEMS(global_game_variables_t *gvar)
 	__asm {
 		jnc	gotinfo
 		mov	errorflag,1
+#ifdef __BORLANDC__
+	}
+#endif
 		gotinfo:
+#ifdef __WATCOMC__
 	}
+#endif
 	if(errorflag)
 		goto error;
 
@@ -180,8 +190,13 @@ __asm	and	dx,0x80
 		jmp	end
 		error:
 		mov	errorflag,1
+#ifdef __BORLANDC__
+	}
+#endif
 		end:
+#ifdef __WATCOMC__
 	}
+#endif
 	if (!_AL)
 		goto error;
 
@@ -328,7 +343,9 @@ error:
 void
 PML_XMSCopy(boolean toxms,byte far *addr,word xmspage,word length, global_game_variables_t *gvar)
 {
+#ifdef __WATCOMC__
 	XMSD;
+#endif
 	dword	xoffset;
 	struct
 	{