database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2021-05-26 11:22:40 +03:00
parent 71e1ddda22 365cd08345
commit 860e754349
65 changed files with 1544 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/threadpool_generic.cc
View File

@ -234,14 +234,19 @@ static void *native_event_get_userdata(native_event *event)
#elif defined(HAVE_KQUEUE)
/*
NetBSD is incompatible with other BSDs , last parameter in EV_SET macro
(udata, user data) needs to be intptr_t, whereas it needs to be void*
everywhere else.
NetBSD prior to 9.99.17 is incompatible with other BSDs, last parameter
in EV_SET macro (udata, user data) needs to be intptr_t, whereas it needs
to be void* everywhere else.
*/
#ifdef __NetBSD__
#include <sys/param.h>
# if !__NetBSD_Prereq__(9,99,17)
#define MY_EV_SET(a, b, c, d, e, f, g) EV_SET(a, b, c, d, e, f, (intptr_t)g)
#else
# endif
#endif
#ifndef MY_EV_SET
#define MY_EV_SET(a, b, c, d, e, f, g) EV_SET(a, b, c, d, e, f, g)
#endif