summaryrefslogtreecommitdiff
path: root/include/my_pthread.h
diff options
context:
space:
mode:
authorsvoj@june.mysql.com <>2007-02-05 15:31:20 +0400
committersvoj@june.mysql.com <>2007-02-05 15:31:20 +0400
commit4a6770e06eddaf8595da3d414764c90502382f88 (patch)
tree82da2e999c2a32e262b0e683aee6c5f89c9d2789 /include/my_pthread.h
parentdde4f421f1f73daa917d5bb7eda8df4b32d97b19 (diff)
parenta602d4a56ec50ca7e7bb9e0c6415145e9de80d44 (diff)
downloadmariadb-git-4a6770e06eddaf8595da3d414764c90502382f88.tar.gz
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
Diffstat (limited to 'include/my_pthread.h')
-rw-r--r--include/my_pthread.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h
index 6b97d87ab7d..4d9f5350b1e 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -269,14 +269,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))