diff options
Diffstat (limited to 'core/fxcrt')
-rw-r--r-- | core/fxcrt/fx_basic_gcc.cpp | 6 | ||||
-rw-r--r-- | core/fxcrt/fx_system.h | 14 |
2 files changed, 4 insertions, 16 deletions
diff --git a/core/fxcrt/fx_basic_gcc.cpp b/core/fxcrt/fx_basic_gcc.cpp index 98a6ead64b..2033265f10 100644 --- a/core/fxcrt/fx_basic_gcc.cpp +++ b/core/fxcrt/fx_basic_gcc.cpp @@ -135,9 +135,9 @@ uint32_t FXSYS_GetModuleFileName(void* hModule, char* buf, uint32_t bufsize) { #ifdef __cplusplus extern "C" { #endif -FXSYS_FILE* FXSYS_wfopen(const wchar_t* filename, const wchar_t* mode) { - return FXSYS_fopen(CFX_ByteString::FromUnicode(filename).c_str(), - CFX_ByteString::FromUnicode(mode).c_str()); +FILE* FXSYS_wfopen(const wchar_t* filename, const wchar_t* mode) { + return fopen(CFX_ByteString::FromUnicode(filename).c_str(), + CFX_ByteString::FromUnicode(mode).c_str()); } char* FXSYS_strlwr(char* str) { if (!str) { diff --git a/core/fxcrt/fx_system.h b/core/fxcrt/fx_system.h index c471085e25..15b81f4778 100644 --- a/core/fxcrt/fx_system.h +++ b/core/fxcrt/fx_system.h @@ -122,18 +122,6 @@ void FXSYS_vsnprintf(char* str, size_t size, const char* fmt, va_list ap); #define FXSYS_sprintf DO_NOT_USE_SPRINTF_DIE_DIE_DIE #define FXSYS_vsprintf DO_NOT_USE_VSPRINTF_DIE_DIE_DIE -#define FXSYS_FILE FILE -#define FXSYS_fopen fopen -#define FXSYS_fclose fclose -#define FXSYS_SEEK_END SEEK_END -#define FXSYS_SEEK_SET SEEK_SET -#define FXSYS_fseek fseek -#define FXSYS_ftell ftell -#define FXSYS_fread fread -#define FXSYS_fwrite fwrite -#define FXSYS_fprintf fprintf -#define FXSYS_fflush fflush - #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ #ifdef _NATIVE_WCHAR_T_DEFINED #define FXSYS_wfopen(f, m) _wfopen((const wchar_t*)(f), (const wchar_t*)(m)) @@ -141,7 +129,7 @@ void FXSYS_vsnprintf(char* str, size_t size, const char* fmt, va_list ap); #define FXSYS_wfopen _wfopen #endif // _NATIVE_WCHAR_T_DEFINED #else -FXSYS_FILE* FXSYS_wfopen(const wchar_t* filename, const wchar_t* mode); +FILE* FXSYS_wfopen(const wchar_t* filename, const wchar_t* mode); #endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ #ifdef __cplusplus |