menu,renderer,vfs: fix -Wcast-function-type-strict on clang 16

This commit is contained in:
Andrei Alexeyev 2023-03-22 22:38:52 +01:00
parent 8b4c440bc9
commit 77dc94bb71
No known key found for this signature in database
GPG key ID: 72D26128040B9690
3 changed files with 12 additions and 5 deletions

View file

@ -58,7 +58,9 @@ void kill_menu(MenuData *menu) {
}
}
static void close_menu_finish(MenuData *menu) {
static void close_menu_finish(void *vmenu) {
MenuData *menu = vmenu;
// This may happen with MF_AlwaysProcessInput menus, so make absolutely sure we
// never run the call chain with menu->state == MS_Dead more than once.
bool was_dead = (menu->state == MS_Dead);

View file

@ -856,8 +856,11 @@ void glcommon_check_capabilities(void) {
#ifndef STATIC_GLES3
if(glcommon_check_extension("GL_ANGLE_request_extension")) {
PFNGLREQUESTEXTENSIONANGLEPROC glRequestExtensionANGLE = (PFNGLREQUESTEXTENSIONANGLEPROC)load_gl_func("glRequestExtensionANGLE");
assert(glRequestExtensionANGLE != NULL);
union {
void (*fp);
PFNGLREQUESTEXTENSIONANGLEPROC glRequestExtensionANGLE;
} u = { load_gl_func("glRequestExtensionANGLE") };
assert(u.glRequestExtensionANGLE != NULL);
const char *src_string = (const char*)glGetString(GL_REQUESTABLE_EXTENSIONS_ANGLE);
char exts[strlen(src_string) + 1];
@ -871,7 +874,7 @@ void glcommon_check_capabilities(void) {
continue;
}
glRequestExtensionANGLE(ext);
u.glRequestExtensionANGLE(ext);
}
}
#endif

View file

@ -119,7 +119,9 @@ static zip_int64_t vfs_zipfile_srcfunc(void *userdata, void *data, zip_uint64_t
}
}
static void vfs_zipfile_free_tls(VFSZipFileTLS *tls) {
static void vfs_zipfile_free_tls(void *vtls) {
VFSZipFileTLS *tls = vtls;
if(tls->zip) {
zip_discard(tls->zip);
}