Merge pull request #8003 from orbea/cxx

Fix CXX_BUILD errors.
This commit is contained in:
Twinaphex 2019-01-14 00:55:54 +01:00 committed by GitHub
commit b93c21091b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -358,7 +358,7 @@ bool egl_init_context(egl_ctx_data_t *egl,
return false;
}
configs = malloc(*count * sizeof(*configs));
configs = (EGLConfig*)malloc(*count * sizeof(*configs));
if (!configs)
return false;

View File

@ -543,8 +543,8 @@ static void udev_joypad_poll(void)
/* Used for sorting devnodes to appear in the correct order */
static int sort_devnodes(const void *a, const void *b)
{
const struct joypad_udev_entry *aa = a;
const struct joypad_udev_entry *bb = b;
const struct joypad_udev_entry *aa = (const struct joypad_udev_entry*)a;
const struct joypad_udev_entry *bb = (const struct joypad_udev_entry*)b;
return strcmp(aa->devnode, bb->devnode);
}