From cd28d5ec8a8d746f7f00ca92b55ce6f3c8671817 Mon Sep 17 00:00:00 2001
From: libretroadmin <reallibretroretroarch@gmail.com>
Date: Thu, 7 Jul 2022 16:37:56 +0200
Subject: [PATCH] (PSL1GHT/Switch) Fix warnings

---
 frontend/drivers/platform_ps3.c               |  2 ++
 gfx/drivers_font/switch_font.c                |  1 -
 libretro-common/include/defines/ps3_defines.h | 20 +++++++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/frontend/drivers/platform_ps3.c b/frontend/drivers/platform_ps3.c
index fd04142f29..bd63e580c3 100644
--- a/frontend/drivers/platform_ps3.c
+++ b/frontend/drivers/platform_ps3.c
@@ -68,10 +68,12 @@ SYS_PROCESS_PARAM(1001, 0x100000)
 SYS_PROCESS_PARAM(1001, 0x200000)
 #endif
 
+#ifndef __PSL1GHT__
 #ifdef HAVE_MULTIMAN
 #define MULTIMAN_SELF_FILE "/dev_hdd0/game/BLES80608/USRDIR/RELOAD.SELF"
 static bool multiman_detected  = false;
 #endif
+#endif
 
 #ifdef HAVE_MEMINFO
 typedef struct {
diff --git a/gfx/drivers_font/switch_font.c b/gfx/drivers_font/switch_font.c
index 1ef1183ca1..f3cee52f06 100644
--- a/gfx/drivers_font/switch_font.c
+++ b/gfx/drivers_font/switch_font.c
@@ -115,7 +115,6 @@ static void switch_font_render_line(
       float scale, const unsigned int color, float pos_x,
       float pos_y, unsigned text_align)
 {
-   const struct font_glyph* glyph_q = NULL;
    int delta_x        = 0;
    int delta_y        = 0;
    unsigned fb_width  = sw->vp.full_width;
diff --git a/libretro-common/include/defines/ps3_defines.h b/libretro-common/include/defines/ps3_defines.h
index 6724691e43..95b2e853c5 100644
--- a/libretro-common/include/defines/ps3_defines.h
+++ b/libretro-common/include/defines/ps3_defines.h
@@ -683,18 +683,38 @@ extern int audioAddData(uint32_t portNum, float *data,
 #define FS_TYPE_DIR 1
 #ifdef __PSL1GHT__
 #include <lv2/sysfs.h>
+#ifndef O_RDONLY
 #define O_RDONLY SYS_O_RDONLY
+#endif
+#ifndef O_WRONLY
 #define O_WRONLY SYS_O_WRONLY
+#endif
+#ifndef O_CREAT
 #define O_CREAT SYS_O_CREAT
+#endif
+#ifndef O_TRUNC
 #define O_TRUNC SYS_O_TRUNC
+#endif
+#ifndef O_RDWR
 #define O_RDWR SYS_O_RDWR
+#endif
 #else
 #include <cell/cell_fs.h>
+#ifndef O_RDONLY
 #define O_RDONLY CELL_FS_O_RDONLY
+#endif
+#ifndef O_WRONLY
 #define O_WRONLY CELL_FS_O_WRONLY
+#endif
+#ifndef O_CREAT
 #define O_CREAT CELL_FS_O_CREAT
+#endif
+#ifndef O_TRUNC
 #define O_TRUNC CELL_FS_O_TRUNC
+#endif
+#ifndef O_RDWR
 #define O_RDWR CELL_FS_O_RDWR
+#endif
 #define sysFsStat cellFsStat
 #define sysFSStat CellFsStat
 #define sysFSDirent CellFsDirent