summaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv/linux/not-cancel.h
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2003-04-23 01:54:03 +0000
committerRoland McGrath <roland@gnu.org>2003-04-23 01:54:03 +0000
commitf478103ff0ab69829f32537947024269296cff17 (patch)
treeb59cefc0f402231e82d6821e1e035cf48d7079c4 /sysdeps/unix/sysv/linux/not-cancel.h
parent4c5dd2a2071c60eaa2d36f8a000fb90a5a5a5813 (diff)
downloadglibc-f478103ff0ab69829f32537947024269296cff17.tar.gz
2003-04-22 Roland McGrath <roland@redhat.com>
* sysdeps/unix/sysv/linux/not-cancel.h: Put parens around macro args. (open_not_cancel): Make last argument non-optional. * sysdeps/generic/check_fds.c (check_one_fd): Update caller. * sysdeps/unix/sysv/linux/gethostid.c (gethostid): Likewise. * iconv/gconv_cache.c (__gconv_load_cache): Likewise.
Diffstat (limited to 'sysdeps/unix/sysv/linux/not-cancel.h')
-rw-r--r--sysdeps/unix/sysv/linux/not-cancel.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/sysdeps/unix/sysv/linux/not-cancel.h b/sysdeps/unix/sysv/linux/not-cancel.h
index cf61cff379..fcd0187a5a 100644
--- a/sysdeps/unix/sysv/linux/not-cancel.h
+++ b/sysdeps/unix/sysv/linux/not-cancel.h
@@ -22,33 +22,32 @@
/* Uncancelable open. */
#ifdef INLINE_SYSCALL
-# define open_not_cancel(name, flags, mode...) \
- ({ int _mode = (0, ##mode); \
- INLINE_SYSCALL (open, 3, (const char *) name, flags, _mode); })
+# define open_not_cancel(name, flags, mode) \
+ INLINE_SYSCALL (open, 3, (const char *) (name), (flags), (mode))
#endif
/* Uncancelable close. */
#ifdef INLINE_SYSCALL
# define close_not_cancel_no_status(fd) \
(void) ({ INTERNAL_SYSCALL_DECL (err); \
- INTERNAL_SYSCALL (close, err, 1, fd); })
+ INTERNAL_SYSCALL (close, err, 1, (fd)); })
#endif
/* Uncancelable read. */
#ifdef INLINE_SYSCALL
# define read_not_cancel(fd, buf, n) \
- INLINE_SYSCALL (read, 3, fd, buf, n)
+ INLINE_SYSCALL (read, 3, (fd), (buf), (n))
#endif
/* Uncancelable write. */
#ifdef INLINE_SYSCALL
# define write_not_cancel(fd, buf, n) \
- INLINE_SYSCALL (write, 3, fd, buf, n)
+ INLINE_SYSCALL (write, 3, (fd), (buf), (n))
#endif
/* Uncancelable writev. */
#ifdef INLINE_SYSCALL
# define writev_not_cancel_no_status(fd, iov, n) \
(void) ({ INTERNAL_SYSCALL_DECL (err); \
- INTERNAL_SYSCALL (writev, err, 3, fd, iov, n); })
+ INTERNAL_SYSCALL (writev, err, 3, (fd), (iov), (n)); })
#endif