diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-08 16:04:01 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-08 16:04:01 +0200 |
| commit | 93b4f84ab25bd2f79e024f339cf06fe2bd99d586 (patch) | |
| tree | 06fa007c99f039067fab2d2f00607b8f416181cf /include | |
| parent | 1e8189fceed795a16d31f484f844b7a4a048b920 (diff) | |
| parent | 2ef2e2322a03b6decf4ad00721a27e6dc308847f (diff) | |
| download | mariadb-git-93b4f84ab25bd2f79e024f339cf06fe2bd99d586.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_alarm.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/my_alarm.h b/include/my_alarm.h index bc0004476ca..287d226fbac 100644 --- a/include/my_alarm.h +++ b/include/my_alarm.h @@ -31,7 +31,9 @@ extern ulong my_time_to_wait_for_lock; #include <signal.h> #ifdef HAVE_SIGHANDLER_T #define sig_return sighandler_t -#elif defined(SOLARIS) || defined(__sun) || defined(__APPLE__) +#elif defined(SOLARIS) || defined(__sun) || defined(__APPLE__) || \ + defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \ + defined(__DragonFly__) typedef void (*sig_return)(int); /* Returns type from signal */ #else typedef void (*sig_return)(void); /* Returns type from signal */ |