From d1120c5fbb409d61b488adf61a72676d3671e44e Mon Sep 17 00:00:00 2001 From: Carmelo Amoroso Date: Wed, 18 Jun 2008 14:49:27 +0000 Subject: Synch with trunk --- libpthread/nptl/sysdeps/unix/sysv/linux/kernel-features.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libpthread/nptl/sysdeps/unix/sysv') diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/kernel-features.h b/libpthread/nptl/sysdeps/unix/sysv/linux/kernel-features.h index 3fc7f8e67..d95ff7412 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/kernel-features.h +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -411,8 +411,10 @@ #endif /* Starting with version 2.6.4-rc1 the getdents syscall returns d_type - information as well. */ -#if __LINUX_KERNEL_VERSION >= 132612 + information as well and in between 2.6.5 and 2.6.8 most compat wrappers + were fixed too. Except s390{,x} which was fixed in 2.6.11. */ +#if (__LINUX_KERNEL_VERSION >= 0x020608 && !defined __s390__) \ + || (__LINUX_KERNEL_VERSION >= 0x02060b && defined __s390__) # define __ASSUME_GETDENTS32_D_TYPE 1 #endif -- cgit v1.2.3