aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-08-27 02:43:04 +0000
committerRoland McGrath <roland@gnu.org>2002-08-27 02:43:04 +0000
commit1717fd72fb6af42b85c6bc0612c5c22820dccb0f (patch)
tree41ea042a467961c183f7dea91d502e05fbab97bd /sysdeps
parentf22dc06d3d24942b7c65cd6f593d35e18c2f8f32 (diff)
downloadglibc-1717fd72fb6af42b85c6bc0612c5c22820dccb0f.tar
glibc-1717fd72fb6af42b85c6bc0612c5c22820dccb0f.tar.gz
glibc-1717fd72fb6af42b85c6bc0612c5c22820dccb0f.tar.bz2
glibc-1717fd72fb6af42b85c6bc0612c5c22820dccb0f.zip
2002-08-26 Roland McGrath <roland@redhat.com>
* sysdeps/generic/sigset-cvt-mask.h (sigset_set_old_mask): Replace macro with inline function. (sigset_get_old_mask): Likewise. * sysdeps/posix/sigblock.c (__sigblock): Update callers. * sysdeps/posix/sigsetmask.c (__sigsetmask): Likewise. * sysdeps/posix/sigpause.c (__sigpause): Likewise. * sysdeps/posix/sigvec.c (__sigvec, sigvec_wrapper_handler): Likewise. * sysdeps/unix/sysv/aix/sigset-cvt-mask.h (sigset_set_old_mask, sigset_get_old_mask): Make these macros return values. * sysdeps/unix/sysv/linux/sigset-cvt-mask.h: Likewise. * sysdeps/unix/sysv/sysv4/sigset-cvt-mask.h: Likewise.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/unix/sysv/aix/sigset-cvt-mask.h9
-rw-r--r--sysdeps/unix/sysv/sysv4/sigset-cvt-mask.h10
2 files changed, 8 insertions, 11 deletions
diff --git a/sysdeps/unix/sysv/aix/sigset-cvt-mask.h b/sysdeps/unix/sysv/aix/sigset-cvt-mask.h
index 762144e3ed..50d70ae81a 100644
--- a/sysdeps/unix/sysv/aix/sigset-cvt-mask.h
+++ b/sysdeps/unix/sysv/aix/sigset-cvt-mask.h
@@ -1,6 +1,6 @@
/* Convert between lowlevel sigmask and libc representation of sigset_t.
AIX version.
- Copyright (C) 1998, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1998,2000,02 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -19,10 +19,7 @@
02111-1307 USA. */
#define sigset_set_old_mask(set, mask) \
- do { \
- (set)->__losigs = (unsigned int) mask; \
- (set)->__hisigs = 0; \
- } while (0)
+ ((set)->__losigs = (unsigned int) (mask), (set)->__hisigs = 0, 0)
#define sigset_get_old_mask(set, mask) \
- ((mask) = (unsigned int) (set)->__losigs)
+ ((unsigned int) (set)->__losigs)
diff --git a/sysdeps/unix/sysv/sysv4/sigset-cvt-mask.h b/sysdeps/unix/sysv/sysv4/sigset-cvt-mask.h
index 7b082f746d..f647dfed86 100644
--- a/sysdeps/unix/sysv/sysv4/sigset-cvt-mask.h
+++ b/sysdeps/unix/sysv/sysv4/sigset-cvt-mask.h
@@ -1,6 +1,6 @@
/* Convert between lowlevel sigmask and libc representation of sigset_t.
SysVr4 version.
- Copyright (C) 1998 Free Software Foundation, Inc.
+ Copyright (C) 1998, 2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Joe Keane <jgk@jgk.org>.
@@ -20,14 +20,14 @@
02111-1307 USA. */
#define sigset_set_old_mask(set, mask) \
- do { \
+ ({ \
unsigned long int *__ptr; \
__ptr = &(set)->__sigbits[0]; \
__ptr[0] = (mask); \
__ptr[1] = 0ul; \
__ptr[2] = 0ul; \
__ptr[3] = 0ul; \
- } while (0)
+ 0; })
-#define sigset_get_old_mask(set, mask) \
- ((mask) = (unsigned int) (set)->__sigbits[0])
+#define sigset_get_old_mask(set) \
+ ((unsigned int) (set)->__sigbits[0])