From c0d3b8f14bf5745f15e4046a3cb311d05b36427a Mon Sep 17 00:00:00 2001
From: libretroadmin <reallibretroretroarch@gmail.com>
Date: Tue, 20 Jun 2023 11:56:25 +0200
Subject: [PATCH] Buildfix for X11 - rename win32_suppress_screensaver to
 win32_suspend_screensaver

---
 gfx/common/win32_common.c      | 2 +-
 gfx/common/win32_common.h      | 2 +-
 gfx/common/x11_common.h        | 2 +-
 gfx/drivers/d3d8.c             | 9 +++------
 gfx/drivers/d3d9cg.c           | 2 +-
 gfx/drivers/d3d9hlsl.c         | 9 +++------
 gfx/drivers_context/w_vk_ctx.c | 2 +-
 gfx/drivers_context/wgl_ctx.c  | 2 +-
 8 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/gfx/common/win32_common.c b/gfx/common/win32_common.c
index e37d1ec11c..bd05720e44 100644
--- a/gfx/common/win32_common.c
+++ b/gfx/common/win32_common.c
@@ -2215,7 +2215,7 @@ bool win32_has_focus(void *data)
 
 HWND win32_get_window(void) { return main_window.hwnd; }
 
-bool win32_suppress_screensaver(void *data, bool enable)
+bool win32_suspend_screensaver(void *data, bool enable)
 {
    if (enable)
    {
diff --git a/gfx/common/win32_common.h b/gfx/common/win32_common.h
index b9fbf2b409..5a0b1c2e52 100644
--- a/gfx/common/win32_common.h
+++ b/gfx/common/win32_common.h
@@ -111,7 +111,7 @@ bool win32_window_create(void *data, unsigned style,
       RECT *mon_rect, unsigned width,
       unsigned height, bool fullscreen);
 
-bool win32_suppress_screensaver(void *data, bool enable);
+bool win32_suspend_screensaver(void *data, bool enable);
 
 bool win32_get_metrics(void *data,
       enum display_metric_types type, float *value);
diff --git a/gfx/common/x11_common.h b/gfx/common/x11_common.h
index c95c92e0d9..7341d14006 100644
--- a/gfx/common/x11_common.h
+++ b/gfx/common/x11_common.h
@@ -30,7 +30,7 @@ extern unsigned g_x11_screen;
 
 void x11_show_mouse(void *data, bool state);
 void x11_set_net_wm_fullscreen(Display *dpy, Window win);
-void x11_suspend_screensaver(void *data, bool enable);
+bool x11_suspend_screensaver(void *data, bool enable);
 
 void x11_move_window(Display *dpy, Window win,
       int x, int y, unsigned width, unsigned height);
diff --git a/gfx/drivers/d3d8.c b/gfx/drivers/d3d8.c
index 50bb500a9d..231e394d07 100644
--- a/gfx/drivers/d3d8.c
+++ b/gfx/drivers/d3d8.c
@@ -1454,10 +1454,7 @@ static bool d3d8_alive(void *data)
 }
 
 #ifdef _XBOX
-static bool d3d8_suppress_screensaver(void *data, bool enable)
-{
-   return true;
-}
+static bool d3d8_suspend_screensaver(void *data, bool enable) { return true; }
 #endif
 
 static void d3d8_set_aspect_ratio(void *data, unsigned aspect_ratio_idx)
@@ -2233,9 +2230,9 @@ video_driver_t video_d3d8 = {
    d3d8_alive,
    NULL, /* focus */
 #ifdef _XBOX
-   d3d8_suppress_screensaver,
+   d3d8_suspend_screensaver,
 #else
-   win32_suppress_screensaver,
+   win32_suspend_screensaver,
 #endif
    d3d8_has_windowed,
    d3d8_set_shader,
diff --git a/gfx/drivers/d3d9cg.c b/gfx/drivers/d3d9cg.c
index 129175a650..9bb8f62b22 100644
--- a/gfx/drivers/d3d9cg.c
+++ b/gfx/drivers/d3d9cg.c
@@ -2282,7 +2282,7 @@ video_driver_t video_d3d9_cg = {
    d3d9_cg_set_nonblock_state,
    d3d9_cg_alive,
    NULL, /* focus */
-   win32_suppress_screensaver,
+   win32_suspend_screensaver,
    d3d9_has_windowed,
    d3d9_cg_set_shader,
    d3d9_cg_free,
diff --git a/gfx/drivers/d3d9hlsl.c b/gfx/drivers/d3d9hlsl.c
index 89a807da08..ea370750dd 100644
--- a/gfx/drivers/d3d9hlsl.c
+++ b/gfx/drivers/d3d9hlsl.c
@@ -1883,10 +1883,7 @@ static void d3d9_hlsl_set_nonblock_state(void *data, bool state,
 }
 
 #ifdef _XBOX
-static bool d3d9_hlsl_suppress_screensaver(void *data, bool enable)
-{
-   return true;
-}
+static bool d3d9_hlsl_suspend_screensaver(void *data, bool enable) { return true; }
 #endif
 
 video_driver_t video_d3d9_hlsl = {
@@ -1896,9 +1893,9 @@ video_driver_t video_d3d9_hlsl = {
    d3d9_hlsl_alive,
    NULL, /* focus */
 #ifdef _XBOX
-   d3d9_hlsl_suppress_screensaver,
+   d3d9_hlsl_suspend_screensaver,
 #else
-   win32_suppress_screensaver,
+   win32_suspend_screensaver,
 #endif
    d3d9_has_windowed,
    d3d9_hlsl_set_shader,
diff --git a/gfx/drivers_context/w_vk_ctx.c b/gfx/drivers_context/w_vk_ctx.c
index 5152dd0e56..0bda03cde3 100644
--- a/gfx/drivers_context/w_vk_ctx.c
+++ b/gfx/drivers_context/w_vk_ctx.c
@@ -316,7 +316,7 @@ const gfx_ctx_driver_t gfx_ctx_w_vk = {
    gfx_ctx_w_vk_check_window,
    gfx_ctx_w_vk_set_resize,
    win32_has_focus,
-   win32_suppress_screensaver,
+   win32_suspend_screensaver,
    true,                            /* has_windowed */
    gfx_ctx_w_vk_swap_buffers,
    gfx_ctx_w_vk_input_driver,
diff --git a/gfx/drivers_context/wgl_ctx.c b/gfx/drivers_context/wgl_ctx.c
index 3cd4bdc372..288ef51ab6 100644
--- a/gfx/drivers_context/wgl_ctx.c
+++ b/gfx/drivers_context/wgl_ctx.c
@@ -798,7 +798,7 @@ const gfx_ctx_driver_t gfx_ctx_wgl = {
    win32_check_window,
    gfx_ctx_wgl_set_resize,
    win32_has_focus,
-   win32_suppress_screensaver,
+   win32_suspend_screensaver,
    true, /* has_windowed */
    gfx_ctx_wgl_swap_buffers,
    gfx_ctx_wgl_input_driver,