diff options
| author | Jonathan Gray | 2003-07-28 07:52:01 +0000 |
|---|---|---|
| committer | Jonathan Gray | 2003-07-28 07:52:01 +0000 |
| commit | 5d309dd171dc2470498ee3721bb6e4fa21016835 (patch) | |
| tree | 041e59de3b6125728bef3160bd6f89792e442386 /sword2 | |
| parent | d520390cc5c9a90c9fdd8e820e76c4468f4daeb9 (diff) | |
| download | scummvm-rg350-5d309dd171dc2470498ee3721bb6e4fa21016835.tar.gz scummvm-rg350-5d309dd171dc2470498ee3721bb6e4fa21016835.tar.bz2 scummvm-rg350-5d309dd171dc2470498ee3721bb6e4fa21016835.zip | |
rename memory struct as well
svn-id: r9234
Diffstat (limited to 'sword2')
| -rw-r--r-- | sword2/driver/driver96.h | 6 | ||||
| -rw-r--r-- | sword2/driver/misc.cpp | 2 | ||||
| -rw-r--r-- | sword2/memory.cpp | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/sword2/driver/driver96.h b/sword2/driver/driver96.h index da1b7dd001..ba6062e68c 100644 --- a/sword2/driver/driver96.h +++ b/sword2/driver/driver96.h @@ -1436,7 +1436,6 @@ typedef struct } _drvKeyStatus; -#ifndef WIN32 // should probably remove this struct as it just replaces a windows struct... typedef struct { DWORD dwLength; @@ -1447,8 +1446,7 @@ typedef struct { DWORD dwAvailPageFile; DWORD dwTotalVirtual; DWORD dwAvailVirtual; -} GCC_PACK MEMORYSTATUS; -#endif +} GCC_PACK SVM_MEMORYSTATUS; // // Function Prototypes @@ -1617,7 +1615,7 @@ extern int32 SetFxIdVolume(int32 id, uint8 vol); //----------------------------------------------------------------------------- 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); diff --git a/sword2/driver/misc.cpp b/sword2/driver/misc.cpp index 9a1a5e27cb..5a78ba6aa3 100644 --- a/sword2/driver/misc.cpp +++ b/sword2/driver/misc.cpp @@ -29,7 +29,7 @@ void SVM_VirtualUnlock(uint8 *free_memman, uint32 total_free_memory) { 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 } diff --git a/sword2/memory.cpp b/sword2/memory.cpp index b8078f61ac..08f1358b7b 100644 --- a/sword2/memory.cpp +++ b/sword2/memory.cpp @@ -69,7 +69,7 @@ void Init_memory_manager(void) //Tony9April96 uint32 j; uint8 *memory_base; //BOOL res; - MEMORYSTATUS memo; + SVM_MEMORYSTATUS memo; //find out how much actual physical RAM this computer has SVM_GlobalMemoryStatus(&memo); |