X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.h;h=701f002de627324a2dae2d84e5c01e594cbb2294;hb=fd42eceddd27e263460498788be4f319560c24a4;hp=27fa00b0b0efaaf74c544e02f9c02863c869f101;hpb=2bc6e98511fbe156f4ec68b1b7dbc7c8c03f866f;p=16.git

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index 27fa00b0..701f002d 100644
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -79,12 +79,13 @@
 #define	XMS_FREEUMB		0x11
 
 //==========================================================================
-
-typedef void /*__seg*/ * memptr;
+//__segment                seg;
+typedef void __based(__self) * memptr; //__based(seg) * memptr;
 
 typedef struct
 {
-	long	nearheap,farheap,EMSmem,XMSmem,mainmem;
+	dword	nearheap,farheap,EMSmem,XMSmem,mainmem;
+	boolean		mmstarted, bombonerror, mmerror;
 } mminfotype;
 
 //==========================================================================
@@ -134,14 +135,11 @@ typedef struct mmblockstruct
 =============================================================================
 */
 
-mminfotype	mminfo;
-memptr		bufferseg;
-boolean		mmerror;
-
-void		(* beforesort) (void);
-void		(* aftersort) (void);
+/*static mminfotype	mminfo;
+static memptr		bufferseg;
 
-static	char *ParmStringsexmm[] = {"noems","noxms",""};
+static void		(* beforesort) (void);
+static void		(* aftersort) (void);*/
 
 /*
 =============================================================================
@@ -151,22 +149,20 @@ static	char *ParmStringsexmm[] = {"noems","noxms",""};
 =============================================================================
 */
 
-boolean		mmstarted;
-
-void huge	*hugeheap;
-void far	*farheap;
-void		*nearheap;
+/*static void huge	*hugeheap;
+static void far	*farheap;
+static void		*nearheap;
 
-mmblocktype	far mmblocks[MAXBLOCKS]
+static mmblocktype	far mmblocks[MAXBLOCKS]
 			,far *mmhead,far *mmfree,far *mmrover,far *mmnew;
 
-boolean		bombonerror;
 
-unsigned	totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle;
+static unsigned	totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle;
+static unsigned int EMSVer;
 
-void		(* XMSaddr) (void);		// far pointer to XMS driver
+static void		(* XMSaddr) (void);		// far pointer to XMS driver
 
-unsigned	numUMBs,UMBbase[MAXUMBS];
+static unsigned	numUMBs,UMBbase[MAXUMBS];*/
 
 //==========================================================================
 
@@ -183,8 +179,10 @@ void MM_SortMem (void);
 
 void MM_ShowMemory (void);
 
-long MM_UnusedMemory (void);
-long MM_TotalFree (void);
+dword MM_UnusedMemory (void);
+dword MM_TotalFree (void);
+void MM_Report(void);
+//int MM_EMSVer(void);
 
 void MM_BombOnError (boolean bomb);