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

[Jonathan Gray]

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

Modified Files:
	driver96.h misc.cpp 
Log Message:
replace DWORD usage with uint32

Index: driver96.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/driver96.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- driver96.h	28 Jul 2003 07:52:01 -0000	1.9
+++ driver96.h	28 Jul 2003 08:04:03 -0000	1.10
@@ -1256,11 +1256,9 @@
 #define FALSE 0
 
 #ifdef WIN32
-#undef DWORD
 #undef LARGE_INTEGER
 #endif
 
-typedef uint32 DWORD;
 typedef long int LARGE_INTEGER;
 
 //
@@ -1438,14 +1436,14 @@
 
 // should probably remove this struct as it just replaces a windows struct...
 typedef struct {
-    DWORD dwLength;
-    DWORD dwMemoryLoad;
-    DWORD dwTotalPhys;
-    DWORD dwAvailPhys;
-    DWORD dwTotalPageFile;
-    DWORD dwAvailPageFile;
-    DWORD dwTotalVirtual;
-    DWORD dwAvailVirtual;
+    uint32 dwLength;
+    uint32 dwMemoryLoad;
+    uint32 dwTotalPhys;
+    uint32 dwAvailPhys;
+    uint32 dwTotalPageFile;
+    uint32 dwAvailPageFile;
+    uint32 dwTotalVirtual;
+    uint32 dwAvailVirtual;
 } GCC_PACK SVM_MEMORYSTATUS;
 
 //
@@ -1619,7 +1617,7 @@
 extern void SVM_SetFileAttributes(char *file, uint32 atrib);
 extern void SVM_DeleteFile(char *file);
 extern void SVM_GetCurrentDirectory(uint32 max, char* path);
-extern int32 SVM_GetVolumeInformation(char *cdPath, char *sCDName, uint32 maxPath, uint8 *, DWORD *dwMaxCompLength, DWORD *dwFSFlags, uint8 *, uint32 a);
+extern int32 SVM_GetVolumeInformation(char *cdPath, char *sCDName, uint32 maxPath, uint8 *, uint32 *dwMaxCompLength, uint32 *dwFSFlags, uint8 *, uint32 a);
 extern void scumm_mkdir(const char *pathname);
 extern void SVM_GetModuleFileName(void *module, char *destStr, uint32 maxLen);
 

Index: misc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/misc.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- misc.cpp	28 Jul 2003 07:52:01 -0000	1.6
+++ misc.cpp	28 Jul 2003 08:04:03 -0000	1.7
@@ -46,7 +46,7 @@
 	warning("stub GetCurrentDirectory");
 }
 
-int32 SVM_GetVolumeInformation(char *cdPath, char *sCDName, uint32 maxPath, uint8 *, DWORD *dwMaxCompLength, DWORD *dwFSFlags, uint8 *, uint32 a) {
+int32 SVM_GetVolumeInformation(char *cdPath, char *sCDName, uint32 maxPath, uint8 *, uint32 *dwMaxCompLength, uint32 *dwFSFlags, uint8 *, uint32 a) {
 	warning("stub GetVolumeInformation %s", cdPath);
 	strcpy(sCDName, CD1_LABEL);
 	return 1;