From 57c6cf4038123982250af140c1ce18d872510d3e Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 31 May 2012 19:33:55 -0700 Subject: [PATCH] Use __SWORD_TYPE for __FSWORD_T_TYPE with -m32 --- ChangeLog | 4 ++++ sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b8fdeda..0752185 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-05-31 H.J. Lu + [BZ #14183] + * sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h (__FSWORD_T_TYPE): + Defined with __SWORD_TYPE if __x86_64__ isn't defined. + [BZ #14117] * sysdeps/unix/sysv/linux/x86_64/bits/siginfo.h: Renamed to ... * sysdeps/unix/sysv/linux/x86/bits/siginfo.h: This. diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h b/sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h index a52a1d3..be8985b 100644 --- a/sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h +++ b/sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h @@ -43,8 +43,10 @@ #define __MODE_T_TYPE __U32_TYPE #ifdef __x86_64__ # define __NLINK_T_TYPE __SYSCALL_ULONG_TYPE +# define __FSWORD_T_TYPE __SYSCALL_SLONG_TYPE #else # define __NLINK_T_TYPE __UWORD_TYPE +# define __FSWORD_T_TYPE __SWORD_TYPE #endif #define __OFF_T_TYPE __SYSCALL_SLONG_TYPE #define __OFF64_T_TYPE __SQUAD_TYPE @@ -57,7 +59,6 @@ #define __FSBLKCNT64_T_TYPE __UQUAD_TYPE #define __FSFILCNT_T_TYPE __SYSCALL_ULONG_TYPE #define __FSFILCNT64_T_TYPE __UQUAD_TYPE -#define __FSWORD_T_TYPE __SYSCALL_SLONG_TYPE #define __ID_T_TYPE __U32_TYPE #define __CLOCK_T_TYPE __SYSCALL_SLONG_TYPE #define __TIME_T_TYPE __SYSCALL_SLONG_TYPE -- 2.7.4