====XMS MOSTLY translated but crashes EXMMTEST.EXE ====

diff --git a/src/exmmtest.c b/src/exmmtest.c
index aaf10f567f5e5c95a79d197725baeb6b594a0be9..58b3e3336c9a2f581e46ed8b7e862409bae9146b 100755 (executable)
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -87,7 +87,7 @@ main(int argc, char *argv[])
        //file name //\r
 \r
        gvar.mm.mmstarted=0;\r
-       debugpm=1;      //debug pm\r
+       dbg_debugpm=1;  //debug pm\r
 \r
        //PRINTBB\r
        if(argv[1]){ bakapee1 = argv[1];\r
@@ -101,7 +101,7 @@ main(int argc, char *argv[])
        MM_Startup(&gvar);\r
        //printf("ok\n");\r
 #ifdef __WATCOMC__\r
-       if(debugpm>0)\r
+       if(dbg_debugpm>0)\r
        {\r
                PM_Startup(&gvar);\r
                //printf("pmstarted ok\n");\r
@@ -157,7 +157,7 @@ for(w=0;w<2;w++)
        //printf("bakapee2=%s\n", bakapee2);\r
        MM_FreePtr(&bigbuffer, &gvar);\r
 #ifdef __WATCOMC__\r
-       if(debugpm>0)\r
+       if(dbg_debugpm>0)\r
                PM_Shutdown(&gvar);\r
 #endif\r
        CA_Shutdown(&gvar);\r

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 16b65aa631537ef305f5eee18ebfe9382b9bb098..c2a966b8750fbb31e28bc2cb0b23122f79372b28 100755 (executable)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -837,7 +837,7 @@ void MM_Startup(global_game_variables_t *gvar)
        gvar->mmi.mainmem = gvar->mmi.nearheap + gvar->mmi.farheap;
 
 #ifndef __16_PM__
-       if(!debugpm) {
+       if(!dbg_debugpm) {
 //
 // detect EMS and allocate up to 64K at page frame
 //
@@ -939,7 +939,7 @@ void MM_Shutdown(global_game_variables_t *gvar)
        free(gvar->mm.nearheap);//      printf("                near freed\n");
 #endif
 #ifdef __DEBUG__
-       if(!debugpm) {
+       if(!dbg_debugpm) {
 #endif
        if(MML_CheckForEMS()){ MML_ShutdownEMS(gvar); }//printf("               EMS freed\n"); }
        if(MML_CheckForXMS(gvar)){ MML_ShutdownXMS(gvar); }//printf("           XMS freed\n"); }

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index 7c681255d63b52ee9cc50c27c5fa18c362d94f63..e816d8854558d240e3bf93fca2611b6615ff1183 100755 (executable)
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -30,7 +30,7 @@
 \r
 #ifdef __DEBUG__               // 1 == Debug/Dev  ;  0 == Production/final\r
 #define OUT_OF_MEM_MSG "MM_GetPtr: Out of memory!\nYou were short :%lu bytes\n"\r
-extern boolean debugpm;\r
+extern boolean dbg_debugpm;\r
 #else\r
 #define OUT_OF_MEM_MSG "\npee\n"\r
 #endif\r

diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c
index 10ee7b6ddee6969f88ae45e9cf92790ecaf8325e..bb08180da0aee934305632ae907157d58b8503ca 100755 (executable)
--- a/src/lib/16_pm.c
+++ b/src/lib/16_pm.c
@@ -30,7 +30,7 @@
 #pragma hdrstop\r
 \r
 #ifdef __DEBUG__\r
-boolean debugpm=0;\r
+boolean dbg_debugpm=0;\r
 #endif\r
 \r
 //     Main Mem specific variables\r

diff --git a/src/lib/16_pm.h b/src/lib/16_pm.h
index cc565424439b5d529dd3f96b9ec19287def92c19..4c015e987fd351f39029c6f4f805b821f2d6db43 100755 (executable)
--- a/src/lib/16_pm.h
+++ b/src/lib/16_pm.h
@@ -35,7 +35,7 @@
 #include <dos.h>\r
 \r
 #ifdef __DEBUG__\r
-extern boolean debugpm;\r
+extern boolean dbg_debugpm;\r
 #endif\r
 \r
 /*//   NOTE! PMPageSize must be an even divisor of EMSPageSize, and >= 1024\r