From 48e551a2e6523e2fa6319932de9a1f6ee141b3e6 Mon Sep 17 00:00:00 2001 From: libretroadmin Date: Mon, 20 Feb 2023 19:32:59 +0100 Subject: [PATCH] (libretro-common/PSL1GHT) Don't redefine defines --- libretro-common/include/defines/ps3_defines.h | 13 ++++++++++++- libretro-common/vfs/vfs_implementation.c | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/libretro-common/include/defines/ps3_defines.h b/libretro-common/include/defines/ps3_defines.h index b1fdd14c1b..5157e4ff94 100644 --- a/libretro-common/include/defines/ps3_defines.h +++ b/libretro-common/include/defines/ps3_defines.h @@ -723,13 +723,24 @@ extern int audioAddData(uint32_t portNum, float *data, #ifndef O_RDWR #define O_RDWR CELL_FS_O_RDWR #endif +#ifndef sysFsStat #define sysFsStat cellFsStat -#define sysFSStat CellFsStat +#endif +#ifndef sysFSDirent #define sysFSDirent CellFsDirent +#endif +#ifndef sysFsOpendir #define sysFsOpendir cellFsOpendir +#endif +#ifndef sysFsReaddir #define sysFsReaddir cellFsReaddir +#endif +#ifndef sysFSDirent #define sysFSDirent CellFsDirent +#endif +#ifndef sysFsClosedir #define sysFsClosedir cellFsClosedir #endif +#endif #endif diff --git a/libretro-common/vfs/vfs_implementation.c b/libretro-common/vfs/vfs_implementation.c index cb57c15f5e..a84569acd2 100644 --- a/libretro-common/vfs/vfs_implementation.c +++ b/libretro-common/vfs/vfs_implementation.c @@ -156,15 +156,26 @@ #ifndef O_RDWR #define O_RDWR CELL_FS_O_RDWR #endif +#ifndef sysFsStat #define sysFsStat cellFsStat -#define sysFSStat CellFsStat +#endif +#ifndef sysFSDirent #define sysFSDirent CellFsDirent +#endif +#ifndef sysFsOpendir #define sysFsOpendir cellFsOpendir +#endif +#ifndef sysFsReaddir #define sysFsReaddir cellFsReaddir +#endif +#ifndef sysFSDirent #define sysFSDirent CellFsDirent +#endif +#ifndef sysFsClosedir #define sysFsClosedir cellFsClosedir #endif #endif +#endif #if defined(VITA) #define FIO_S_ISDIR SCE_S_ISDIR