diff options
| author | monty@mysql.com/narttu.mysql.fi <> | 2007-02-21 14:07:08 +0200 |
|---|---|---|
| committer | monty@mysql.com/narttu.mysql.fi <> | 2007-02-21 14:07:08 +0200 |
| commit | 26aa385bc5278ec0ae842cf6558d8fd32b6876f1 (patch) | |
| tree | 57fb0c9c6c3686011b021c42671cf5065cdc0cf6 /include/my_pthread.h | |
| parent | 37cedb7efad7568b496eb981e40a0910c0e22494 (diff) | |
| parent | 222e128b34e7cfa67270a03c3d690d81dc0bc17b (diff) | |
| download | mariadb-git-26aa385bc5278ec0ae842cf6558d8fd32b6876f1.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'include/my_pthread.h')
| -rw-r--r-- | include/my_pthread.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index f5c7ad62a16..30c48b42c7f 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -370,14 +370,14 @@ int sigwait(sigset_t *setp, int *sigp); /* Use our implemention */ we want to make sure that no such flags are set. */ #if defined(HAVE_SIGACTION) && !defined(my_sigset) -#define my_sigset(A,B) do { struct sigaction s; sigset_t set; int rc; \ - DBUG_ASSERT((A) != 0); \ - sigemptyset(&set); \ - s.sa_handler = (B); \ - s.sa_mask = set; \ - s.sa_flags = 0; \ - rc= sigaction((A), &s, (struct sigaction *) NULL);\ - DBUG_ASSERT(rc == 0); \ +#define my_sigset(A,B) do { struct sigaction l_s; sigset_t l_set; int l_rc; \ + DBUG_ASSERT((A) != 0); \ + sigemptyset(&l_set); \ + l_s.sa_handler = (B); \ + l_s.sa_mask = l_set; \ + l_s.sa_flags = 0; \ + l_rc= sigaction((A), &l_s, (struct sigaction *) NULL);\ + DBUG_ASSERT(l_rc == 0); \ } while (0) #elif defined(HAVE_SIGSET) && !defined(my_sigset) #define my_sigset(A,B) sigset((A),(B)) |