diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2015-08-21 09:57:15 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2015-08-21 09:57:15 -0700 |
| commit | e5dee2c896f04d88defdfa00282fa83f5f4004d8 (patch) | |
| tree | caebcffacffc0363dc418694eba18b2ce6b8617b /sysdeps/unix/sysv/linux/shmat.c | |
| parent | 8c7c251746ce41779637c83e3b35639517f728d5 (diff) | |
| download | glibc-e5dee2c896f04d88defdfa00282fa83f5f4004d8.tar glibc-e5dee2c896f04d88defdfa00282fa83f5f4004d8.tar.gz glibc-e5dee2c896f04d88defdfa00282fa83f5f4004d8.tar.bz2 glibc-e5dee2c896f04d88defdfa00282fa83f5f4004d8.zip | |
Revert "Add INLINE_SYSCALL_RETURN/INLINE_SYSCALL_ERROR_RETURN"
This reverts commit 0c5b8b5941e036dcaac69cecee9f01fdf9218e6e.
Diffstat (limited to 'sysdeps/unix/sysv/linux/shmat.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/shmat.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sysdeps/unix/sysv/linux/shmat.c b/sysdeps/unix/sysv/linux/shmat.c index 45ebd1177c..94d18d3f66 100644 --- a/sysdeps/unix/sysv/linux/shmat.c +++ b/sysdeps/unix/sysv/linux/shmat.c @@ -42,10 +42,11 @@ shmat (shmid, shmaddr, shmflg) shmid, shmflg, (long int) &raddr, (void *) shmaddr); - if (__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (resultvar, err))) - return INLINE_SYSCALL_ERROR_RETURN (-INTERNAL_SYSCALL_ERRNO (resultvar, - err), - void *, -1l); - else - return raddr; + if (INTERNAL_SYSCALL_ERROR_P (resultvar, err)) + { + __set_errno (INTERNAL_SYSCALL_ERRNO (resultvar, err)); + return (void *) -1l; + } + + return raddr; } |