From 8d8649b33f35e55deb393709beac0f2acb0c184f Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 6 Jan 2025 11:35:54 -0800 Subject: [PATCH] Fixed error: returning 'SDL_TrayEntry **' from a function with incompatible return type 'const SDL_TrayEntry **' --- src/tray/cocoa/SDL_tray.m | 2 +- src/tray/unix/SDL_tray.c | 2 +- src/tray/windows/SDL_tray.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tray/cocoa/SDL_tray.m b/src/tray/cocoa/SDL_tray.m index 911285bcb3..0bb6fe80df 100644 --- a/src/tray/cocoa/SDL_tray.m +++ b/src/tray/cocoa/SDL_tray.m @@ -281,7 +281,7 @@ const SDL_TrayEntry **SDL_GetTrayEntries(SDL_TrayMenu *menu, int *size) if (size) { *size = menu->nEntries; } - return menu->entries; + return (const SDL_TrayEntry **)menu->entries; } void SDL_RemoveTrayEntry(SDL_TrayEntry *entry) diff --git a/src/tray/unix/SDL_tray.c b/src/tray/unix/SDL_tray.c index afa06ac8e6..de2ab4b2c7 100644 --- a/src/tray/unix/SDL_tray.c +++ b/src/tray/unix/SDL_tray.c @@ -494,7 +494,7 @@ const SDL_TrayEntry **SDL_GetTrayEntries(SDL_TrayMenu *menu, int *size) if (size) { *size = menu->nEntries; } - return menu->entries; + return (const SDL_TrayEntry **)menu->entries; } void SDL_RemoveTrayEntry(SDL_TrayEntry *entry) diff --git a/src/tray/windows/SDL_tray.c b/src/tray/windows/SDL_tray.c index e92a160119..f61fa04d8e 100644 --- a/src/tray/windows/SDL_tray.c +++ b/src/tray/windows/SDL_tray.c @@ -310,7 +310,7 @@ const SDL_TrayEntry **SDL_GetTrayEntries(SDL_TrayMenu *menu, int *size) if (size) { *size = menu->nEntries; } - return menu->entries; + return (const SDL_TrayEntry **)menu->entries; } void SDL_RemoveTrayEntry(SDL_TrayEntry *entry)