diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2006-02-15 17:20:33 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2006-02-15 17:20:33 +0000 |
| commit | 683040c3b2c7dc2bc08045202a0a0b46d143b3cb (patch) | |
| tree | fcd73510f2bcfcdf57078331d800db4217db759b /sysdeps/unix/sysv/linux/not-cancel.h | |
| parent | b007ce7cc6971e4bd4cd91c558efd3d4603d941d (diff) | |
| download | glibc-683040c3b2c7dc2bc08045202a0a0b46d143b3cb.tar.gz glibc-683040c3b2c7dc2bc08045202a0a0b46d143b3cb.tar.xz glibc-683040c3b2c7dc2bc08045202a0a0b46d143b3cb.zip | |
* sysdeps/unix/sysv/linux/not-cancel.h (__openat_not_cancel,
__openat64_not_cancel): Remove prototypes. (__openat_nocancel, __openat64_nocancel): New prototypes or defines. (openat_not_cancel, openat_not_cancel_3, openat64_not_cancel, openat64_not_cancel_3): Use them.
Diffstat (limited to 'sysdeps/unix/sysv/linux/not-cancel.h')
| -rw-r--r-- | sysdeps/unix/sysv/linux/not-cancel.h | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/sysdeps/unix/sysv/linux/not-cancel.h b/sysdeps/unix/sysv/linux/not-cancel.h index ece8d69ecf..4a76335a55 100644 --- a/sysdeps/unix/sysv/linux/not-cancel.h +++ b/sysdeps/unix/sysv/linux/not-cancel.h @@ -28,18 +28,26 @@ INLINE_SYSCALL (open, 2, (const char *) (name), (flags)) /* Uncancelable openat. */ -extern int __openat_not_cancel (int fd, const char *fname, int oflag, +#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt +extern int __openat_nocancel (int fd, const char *fname, int oflag, + mode_t mode) attribute_hidden; +extern int __openat64_nocancel (int fd, const char *fname, int oflag, mode_t mode) attribute_hidden; +#else +# define __openat_nocancel(fd, fname, oflag, mode) \ + openat (fd, fname, oflag, mode) +# define __openat64_nocancel(fd, fname, oflag, mode) \ + openat64 (fd, fname, oflag, mode) +#endif + #define openat_not_cancel(fd, fname, oflag, mode) \ - __openat_not_cancel (fd, fname, oflag, mode) + __openat_nocancel (fd, fname, oflag, mode) #define openat_not_cancel_3(fd, fname, oflag) \ - __openat_not_cancel (fd, fname, oflag, 0) -extern int __openat64_not_cancel (int fd, const char *fname, int oflag, - mode_t mode) attribute_hidden; + __openat_nocancel (fd, fname, oflag, 0) #define openat64_not_cancel(fd, fname, oflag, mode) \ - __openat64_not_cancel (fd, fname, oflag, mode) + __openat64_nocancel (fd, fname, oflag, mode) #define openat64_not_cancel_3(fd, fname, oflag) \ - __openat64_not_cancel (fd, fname, oflag, 0) + __openat64_nocancel (fd, fname, oflag, 0) /* Uncancelable close. */ #define close_not_cancel(fd) \ |