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

[Jonathan Gray]

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

Modified Files:
	driver96.h misc.cpp 
Log Message:
undefine these functions for now but in the long run we should probably rename them

Index: driver96.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/driver96.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- driver96.h	28 Jul 2003 03:52:05 -0000	1.5
+++ driver96.h	28 Jul 2003 07:31:14 -0000	1.6
@@ -1612,8 +1612,19 @@
 extern int32 SetFxVolumePan(int32 id, uint8 vol, int8 pan);
 extern int32 SetFxIdVolume(int32 id, uint8 vol);
 
+#ifdef WIN32
+
+#undef timeGetTime
+#undef VirtualUnlock
+#undef GlobalMemoryStatus
+#undef SetFileAttributes
+#undef GetCurrentDirectory
+#undef GetVolumeInformation
+#undef _mkdir
+#undef GetModuleFileName
+
+#endif
 
-#ifndef WIN32
 //-----------------------------------------------------------------------------
 //	Misc functions - from misc.cpp
 //-----------------------------------------------------------------------------
@@ -1626,7 +1637,6 @@
 extern int32 GetVolumeInformation(char *cdPath, char *sCDName, uint32 maxPath, uint8 *, DWORD *dwMaxCompLength, DWORD *dwFSFlags, uint8 *, uint32 a);
 extern void _mkdir(const char *pathname);
 extern void GetModuleFileName(void *module, char *destStr, uint32 maxLen);
-#endif
 
 //-----------------------------------------------------------------------------
 //Macro for calling error handler with source filename and line.

Index: misc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/misc.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- misc.cpp	28 Jul 2003 03:12:49 -0000	1.2
+++ misc.cpp	28 Jul 2003 07:31:14 -0000	1.3
@@ -21,11 +21,9 @@
 #include "driver96.h"
 #include "../sword2.h"
 
-#ifndef WIN32
 uint32 timeGetTime(void) {
 	return g_bs2->_syst->get_msecs();
 }
-#endif
 
 void VirtualUnlock(uint8 *free_memman, uint32 total_free_memory) {
 	warning("stub VirtualUnlock");
@@ -54,12 +52,10 @@
 	return 1;
 }
 
-#ifndef WIN32
 // FIXME wrap different platform specific mkdir calls and actually do something
 void _mkdir(const char *pathname) {
 	warning("stub _mkdir %s", pathname);
 }
-#endif
 
 void GetModuleFileName(void *module, char *destStr, uint32 maxLen) {
 	warning("stub GetModuleFileName");