[Scummvm-cvs-logs] CVS: scummvm/bs2/driver driver96.h,1.8,1.9 misc.cpp,1.5,1.6

[Jonathan Gray]

Update of /cvsroot/scummvm/scummvm/bs2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv19682/driver

Modified Files:
	driver96.h misc.cpp 
Log Message:
rename memory struct as well

Index: driver96.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/driver96.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- driver96.h	28 Jul 2003 07:47:20 -0000	1.8
+++ driver96.h	28 Jul 2003 07:52:01 -0000	1.9
@@ -1436,7 +1436,6 @@
 } _drvKeyStatus;
 
 
-#ifndef WIN32
 // should probably remove this struct as it just replaces a windows struct...
 typedef struct {
     DWORD dwLength;
@@ -1447,8 +1446,7 @@
     DWORD dwAvailPageFile;
     DWORD dwTotalVirtual;
     DWORD dwAvailVirtual;
-} GCC_PACK MEMORYSTATUS;
-#endif
+} GCC_PACK SVM_MEMORYSTATUS;
 
 //
 //	Function Prototypes
@@ -1617,7 +1615,7 @@
 //-----------------------------------------------------------------------------
 extern uint32 SVM_timeGetTime(void);
 extern void SVM_VirtualUnlock(uint8 *free_memman, uint32 total_free_memory);
-extern void SVM_GlobalMemoryStatus(MEMORYSTATUS *memo);
+extern void SVM_GlobalMemoryStatus(SVM_MEMORYSTATUS *memo);
 extern void SVM_SetFileAttributes(char *file, uint32 atrib);
 extern void SVM_DeleteFile(char *file);
 extern void SVM_GetCurrentDirectory(uint32 max, char* path);

Index: misc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/misc.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- misc.cpp	28 Jul 2003 07:47:21 -0000	1.5
+++ misc.cpp	28 Jul 2003 07:52:01 -0000	1.6
@@ -29,7 +29,7 @@
 	warning("stub VirtualUnlock");
 }
 
-void SVM_GlobalMemoryStatus(MEMORYSTATUS *memo) {
+void SVM_GlobalMemoryStatus(SVM_MEMORYSTATUS *memo) {
 	warning("stub GlobalMemoryStatus");
 	memo->dwTotalPhys = 16000*1024; // hard code 16mb for now
 }