diff options
| -rw-r--r-- | sword2/driver/driver96.h | 14 | ||||
| -rw-r--r-- | sword2/driver/misc.cpp | 4 |
2 files changed, 12 insertions, 6 deletions
diff --git a/sword2/driver/driver96.h b/sword2/driver/driver96.h index ab0969e01c..8b5b3fdefc 100644 --- a/sword2/driver/driver96.h +++ b/sword2/driver/driver96.h @@ -1612,8 +1612,19 @@ extern int32 IsFxOpen(int32 id); 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 void GetCurrentDirectory(uint32 max, char* path); 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. diff --git a/sword2/driver/misc.cpp b/sword2/driver/misc.cpp index 4819be7d49..7843c3352a 100644 --- a/sword2/driver/misc.cpp +++ b/sword2/driver/misc.cpp @@ -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 @@ int32 GetVolumeInformation(char *cdPath, char *sCDName, uint32 maxPath, uint8 *, 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"); |