diff options
| author | Ben Cheng <bccheng@google.com> | 2013-10-16 20:47:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-10-16 20:47:30 +0000 |
| commit | e2463e9645637b7ece9258c0db563d403ef64edb (patch) | |
| tree | 7185e92e4756043c676021bb50e817dd1df48ea5 | |
| parent | 735b4c93efafac7ed46afacded892e016e8abc04 (diff) | |
| parent | 3c977d220ea6a9450a060861cd5a4317c37cb190 (diff) | |
| download | kernel-headers-e2463e9645637b7ece9258c0db563d403ef64edb.tar.gz | |
Merge "Flatten question statements into if/else statements"
| -rw-r--r-- | original/uapi/linux/acct.h | 4 | ||||
| -rw-r--r-- | original/uapi/linux/aio_abi.h | 4 | ||||
| -rw-r--r-- | original/uapi/linux/raid/md_p.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/original/uapi/linux/acct.h b/original/uapi/linux/acct.h index df2f9a0..d3e0428 100644 --- a/original/uapi/linux/acct.h +++ b/original/uapi/linux/acct.h @@ -107,9 +107,9 @@ struct acct_v3 #define ACORE 0x08 /* ... dumped core */ #define AXSIG 0x10 /* ... was killed by a signal */ -#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __BIG_ENDIAN : defined(__BIG_ENDIAN) +#if (defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN)) || defined(__BIG_ENDIAN) #define ACCT_BYTEORDER 0x80 /* accounting file is big endian */ -#elif defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN) +#elif (defined(__BYTE_ORDER) && (__BYTE_ORDER == __LITTLE_ENDIAN)) || defined(__LITTLE_ENDIAN) #define ACCT_BYTEORDER 0x00 /* accounting file is little endian */ #else #error unspecified endianness diff --git a/original/uapi/linux/aio_abi.h b/original/uapi/linux/aio_abi.h index bb2554f..609e223 100644 --- a/original/uapi/linux/aio_abi.h +++ b/original/uapi/linux/aio_abi.h @@ -62,9 +62,9 @@ struct io_event { __s64 res2; /* secondary result */ }; -#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN) +#if (defined(__BYTE_ORDER) && (__BYTE_ORDER == __LITTLE_ENDIAN)) || defined(__LITTLE_ENDIAN) #define PADDED(x,y) x, y -#elif defined(__BYTE_ORDER) ? __BYTE_ORDER == __BIG_ENDIAN : defined(__BIG_ENDIAN) +#elif (defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN)) || defined(__BIG_ENDIAN) #define PADDED(x,y) y, x #else #error edit for your odd byteorder. diff --git a/original/uapi/linux/raid/md_p.h b/original/uapi/linux/raid/md_p.h index fe1a540..d0e164d 100644 --- a/original/uapi/linux/raid/md_p.h +++ b/original/uapi/linux/raid/md_p.h @@ -145,12 +145,12 @@ typedef struct mdp_superblock_s { __u32 failed_disks; /* 4 Number of failed disks */ __u32 spare_disks; /* 5 Number of spare disks */ __u32 sb_csum; /* 6 checksum of the whole superblock */ -#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __BIG_ENDIAN : defined(__BIG_ENDIAN) +#if (defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN)) || defined(__BIG_ENDIAN) __u32 events_hi; /* 7 high-order of superblock update count */ __u32 events_lo; /* 8 low-order of superblock update count */ __u32 cp_events_hi; /* 9 high-order of checkpoint update count */ __u32 cp_events_lo; /* 10 low-order of checkpoint update count */ -#elif defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN) +#elif (defined(__BYTE_ORDER) && (__BYTE_ORDER == __LITTLE_ENDIAN)) || defined(__LITTLE_ENDIAN) __u32 events_lo; /* 7 low-order of superblock update count */ __u32 events_hi; /* 8 high-order of superblock update count */ __u32 cp_events_lo; /* 9 low-order of checkpoint update count */ |