diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-08 07:47:49 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-08 07:47:49 +0300 |
| commit | 7b48da4d7e84759b9d4ceb40b9aeb6d28b27f93c (patch) | |
| tree | b437f9ab63a66034822348f77f6b4654a9a95669 /include | |
| parent | 81258f14323e1d1ad0203bae93bc55a30d47c1b3 (diff) | |
| parent | f69c1c9dcb815d7597ec2035470a81ac3b6c9380 (diff) | |
| download | mariadb-git-7b48da4d7e84759b9d4ceb40b9aeb6d28b27f93c.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_pthread.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index a1b80889ed3..ee4cd15b958 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -197,7 +197,6 @@ static inline int my_sigwait(sigset_t *set, int *sig, int *code) *code= siginfo.si_code; return *sig < 0 ? errno : 0; #else -#define SI_KERNEL 128 *code= 0; return sigwait(set, sig); #endif |