diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-02-09 15:49:50 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-02-09 15:49:50 +0200 |
| commit | cce994057bf7e2bdb62686075de03aeb5db4bbda (patch) | |
| tree | 0b1413d979a0c573de8d7c0721d2586b099ad275 /include | |
| parent | 1bed56400e19f39697332205038d0cb1d51b25aa (diff) | |
| parent | fd101daa84ec5f70f09c48e3fb7a4ce8f6d26edb (diff) | |
| download | mariadb-git-cce994057bf7e2bdb62686075de03aeb5db4bbda.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_alarm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_alarm.h b/include/my_alarm.h index 14a81c1ef17..df5cb7f51de 100644 --- a/include/my_alarm.h +++ b/include/my_alarm.h @@ -31,7 +31,7 @@ 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__) || defined(__FreeBSD__) +#elif defined(SOLARIS) || defined(__sun) || defined(__APPLE__) || defined(__FreeBSD__) || defined(_AIX) typedef void (*sig_return)(int); /* Returns type from signal */ #else typedef void (*sig_return)(void); /* Returns type from signal */ |