diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2009-05-22 20:28:34 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2009-05-22 20:28:34 +0000 |
commit | 6b946eeb50a57ee4ff8c50783d516bb03cf89b7a (patch) | |
tree | 19d7e79d38b73083f6786b448e2c148e04533b9a /libc/sysdeps/unix/sysv/linux/kernel-features.h | |
parent | 8394b52f4259c85b39e1114e6f239599f50fbcc2 (diff) |
Merge changes between r8463 and r8486 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@8487 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/unix/sysv/linux/kernel-features.h')
-rw-r--r-- | libc/sysdeps/unix/sysv/linux/kernel-features.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/sysdeps/unix/sysv/linux/kernel-features.h b/libc/sysdeps/unix/sysv/linux/kernel-features.h index 473360a13..456251579 100644 --- a/libc/sysdeps/unix/sysv/linux/kernel-features.h +++ b/libc/sysdeps/unix/sysv/linux/kernel-features.h @@ -521,7 +521,7 @@ /* Support for the accept4 syscall was added in 2.6.28. */ #if __LINUX_KERNEL_VERSION >= 0x02061c \ && (defined __i386__ || defined __x86_64__ || defined __powerpc__ \ - || defined __ia64__ || defined __sparc__ || defined __s390__) + || defined __sparc__ || defined __s390__) # define __ASSUME_ACCEPT4 1 #endif |