X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.h;h=33e1e526cfb55f87c27e0120ec225a42f96d77a8;hb=c5a5d3be15dc4c1de46f86cec8dd5a161563b1b9;hp=de35b428b6197884a9ead179cce0d1e9c0e388ad;hpb=47cdc66151d973d975d0e31fb8a786eb639bebdb;p=16.git

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index de35b428..33e1e526 100755
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -25,6 +25,7 @@
 #include <malloc.h>
 #include "src/lib/16_head.h"
 #include "src/lib/16_hc.h"
+#include "src/lib/16_lib.h"
 //#include "src/lib/modex16.h"
 //++++mh	#include "src/lib/16_in.h"
 
@@ -44,7 +45,8 @@
 
 #define	BUFFERSIZE		0x1000		// miscelanious, allways available buffer
 
-#define MAXBLOCKS		1024
+//moved to typdefst
+//#define MAXBLOCKS		1024
 
 
 
@@ -88,10 +90,11 @@
 
 //==========================================================================
 
-typedef struct
+//moved to typdefst
+/*typedef struct
 {
 	dword	nearheap,farheap,EMSmem,XMSmem,mainmem;
-} mminfotype;
+} mminfotype;*/
 
 //==========================================================================
 
@@ -114,10 +117,12 @@ extern void		(* XMSaddr) (void);		// far pointer to XMS driver
 #define PURGEMASK	0xfffc
 #define BASEATTRIBUTES	0	// unlocked, non purgable
 
-#define MAXUMBS		12
+//moved to typedefst
+//#define MAXUMBS		12
 #define MAPPAGES		4//mm->EMSpagesmapped
 
-typedef struct mmblockstruct
+//moved to typdefst
+/*typedef struct mmblockstruct
 {
 	word	start,length;
 	//word	start;	dword length;
@@ -148,7 +153,7 @@ typedef struct
 	//dword	numUMBs,UMBbase[MAXUMBS];
 	//huge mmblocktype	huge mmblocks[MAXBLOCKS],huge *mmhead,huge *mmfree,huge *mmrover,huge *mmnew;
 	mmblocktype	far mmblocks[MAXBLOCKS],far *mmhead,far *mmfree,far *mmrover,far *mmnew;
-} mminfo_t;
+} mminfo_t;*/
 
 /*
 =============================================================================
@@ -188,11 +193,11 @@ void MM_FreePtr(memptr *baseptr, mminfo_t *mm);
 void MM_SetPurge(memptr *baseptr, int purge, mminfo_t *mm);
 void MM_SetLock(memptr *baseptr, boolean locked, mminfo_t *mm);
 void MM_SortMem(mminfo_t *mm);
-void MM_ShowMemory(global_game_variables_t *gvar,/*page_t *page, */mminfo_t *mm);
+void MM_ShowMemory(global_game_variables_t *gvar);//,/*page_t *page, */mminfo_t *mm);
 void MM_DumpData(mminfo_t *mm);
 dword MM_UnusedMemory(mminfo_t *mm);
 dword MM_TotalFree(mminfo_t *mm);
-void MM_Report(/*page_t *page, */mminfo_t *mm, mminfotype *mmi);
+void MM_Report_(global_game_variables_t *gvar);
 static void MM_EMSerr(byte *stri, byte err);
 void MM_BombOnError(boolean bomb, mminfo_t *mm);
 //void MM_GetNewBlock(mminfo_t *mm);