From 28637bc4078be82d242c6ce1c098ba423c957f2c Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Mon, 29 Jul 2019 18:09:55 -0400 Subject: [PATCH] collapse out byte order conditions in bits/sem.h for fixed-endian archs having preprocessor conditionals on byte order in the bits headers for fixed-endian archs is confusing at best. remove them. --- arch/i386/bits/sem.h | 5 ----- arch/m68k/bits/sem.h | 5 ----- arch/or1k/bits/sem.h | 5 ----- arch/x86_64/bits/sem.h | 5 ----- 4 files changed, 20 deletions(-) diff --git a/arch/i386/bits/sem.h b/arch/i386/bits/sem.h index d383d4ea..e61571c1 100644 --- a/arch/i386/bits/sem.h +++ b/arch/i386/bits/sem.h @@ -4,13 +4,8 @@ struct semid_ds { long __unused1; time_t sem_ctime; long __unused2; -#if __BYTE_ORDER == __LITTLE_ENDIAN unsigned short sem_nsems; char __sem_nsems_pad[sizeof(long)-sizeof(short)]; -#else - char __sem_nsems_pad[sizeof(long)-sizeof(short)]; - unsigned short sem_nsems; -#endif long __unused3; long __unused4; }; diff --git a/arch/m68k/bits/sem.h b/arch/m68k/bits/sem.h index d383d4ea..08faafea 100644 --- a/arch/m68k/bits/sem.h +++ b/arch/m68k/bits/sem.h @@ -4,13 +4,8 @@ struct semid_ds { long __unused1; time_t sem_ctime; long __unused2; -#if __BYTE_ORDER == __LITTLE_ENDIAN - unsigned short sem_nsems; - char __sem_nsems_pad[sizeof(long)-sizeof(short)]; -#else char __sem_nsems_pad[sizeof(long)-sizeof(short)]; unsigned short sem_nsems; -#endif long __unused3; long __unused4; }; diff --git a/arch/or1k/bits/sem.h b/arch/or1k/bits/sem.h index d383d4ea..08faafea 100644 --- a/arch/or1k/bits/sem.h +++ b/arch/or1k/bits/sem.h @@ -4,13 +4,8 @@ struct semid_ds { long __unused1; time_t sem_ctime; long __unused2; -#if __BYTE_ORDER == __LITTLE_ENDIAN - unsigned short sem_nsems; - char __sem_nsems_pad[sizeof(long)-sizeof(short)]; -#else char __sem_nsems_pad[sizeof(long)-sizeof(short)]; unsigned short sem_nsems; -#endif long __unused3; long __unused4; }; diff --git a/arch/x86_64/bits/sem.h b/arch/x86_64/bits/sem.h index d383d4ea..e61571c1 100644 --- a/arch/x86_64/bits/sem.h +++ b/arch/x86_64/bits/sem.h @@ -4,13 +4,8 @@ struct semid_ds { long __unused1; time_t sem_ctime; long __unused2; -#if __BYTE_ORDER == __LITTLE_ENDIAN unsigned short sem_nsems; char __sem_nsems_pad[sizeof(long)-sizeof(short)]; -#else - char __sem_nsems_pad[sizeof(long)-sizeof(short)]; - unsigned short sem_nsems; -#endif long __unused3; long __unused4; }; -- 2.25.1