mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

This commit revert part of the changes done for the PS4 implementation but fixes PS2 crash

Browse Source
This commit is contained in:
Francisco Javier Trujillo Mata 2019-01-10 02:20:49 +01:00
parent c7779ff046
commit 9c7c5e0814
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libretro-common/compat/fopen_utf8.c
View File

@ -31,10 +31,11 @@
#endif #endif
#endif #endif
#ifdef _WIN32
#undef fopen
void *fopen_utf8(const char * filename, const char * mode) void *fopen_utf8(const char * filename, const char * mode)
{ {
#if defined(_WIN32)
#undef fopen
#if defined(_XBOX) #if defined(_XBOX)
return fopen(filename, mode); return fopen(filename, mode);
#elif defined(LEGACY_WIN32) #elif defined(LEGACY_WIN32)
@ -55,7 +56,5 @@ void *fopen_utf8(const char * filename, const char * mode)
free(mode_w); free(mode_w);
return ret; return ret;
#endif #endif
#else
return fopen(filename, mode);
#endif
} }
#endif

2
libretro-common/file/file_path.c
View File

@ -219,7 +219,7 @@ static bool path_stat(const char *path, enum stat_mode mode, int32_t *size)
#endif #endif
case IS_CHARACTER_SPECIAL: case IS_CHARACTER_SPECIAL:
#if defined(VITA) || defined(PSP) || defined(PS2) || defined(__CELLOS_LV2__) || defined(_WIN32) #if defined(VITA) || defined(PSP) || defined(PS2) || defined(__CELLOS_LV2__) || defined(_WIN32)
break; return false;
#else #else
return S_ISCHR(buf.st_mode); return S_ISCHR(buf.st_mode);
#endif #endif

10
libretro-common/include/compat/fopen_utf8.h
View File

@ -23,12 +23,12 @@
#ifndef __LIBRETRO_SDK_COMPAT_FOPEN_UTF8_H #ifndef __LIBRETRO_SDK_COMPAT_FOPEN_UTF8_H
#define __LIBRETRO_SDK_COMPAT_FOPEN_UTF8_H #define __LIBRETRO_SDK_COMPAT_FOPEN_UTF8_H
/* Defined to error rather than fopen_utf8, to make it #ifdef _WIN32
* clear to everyone reading the code that not worrying /* Defined to error rather than fopen_utf8, to make it clear to everyone reading the code that not worrying about utf16 is fine */
* about UTF16 is fine. */
/* TODO: enable */ /* TODO: enable */
/* #define fopen (use fopen_utf8 instead) */ /* #define fopen (use fopen_utf8 instead) */
void *fopen_utf8(const char * filename, const char * mode); void *fopen_utf8(const char * filename, const char * mode);
#else
#define fopen_utf8 fopen
#endif
#endif #endif