diff options
| author | Karel Zak | 2011-08-02 12:30:57 +0200 |
|---|---|---|
| committer | Karel Zak | 2011-08-02 12:33:10 +0200 |
| commit | d1425592a2970b53a5941c3efe59197a3f418259 (patch) | |
| tree | f10d0dea0061b999dad6ccc9ee3169dca7ac3f4b | |
| parent | libmount: fix compiler warnings [-Wunused-parameter -Wsign-compare] (diff) | |
| download | kernel-qcow2-util-linux-d1425592a2970b53a5941c3efe59197a3f418259.tar.gz kernel-qcow2-util-linux-d1425592a2970b53a5941c3efe59197a3f418259.tar.xz kernel-qcow2-util-linux-d1425592a2970b53a5941c3efe59197a3f418259.zip | |
include: [bitops.h] make return values consistent
The *_to_cpu() and cpu_to_*() macros have to return always the same date types
independently on CPU type.
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | include/bitops.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/include/bitops.h b/include/bitops.h index 80d6f6f07..81375d060 100644 --- a/include/bitops.h +++ b/include/bitops.h @@ -51,29 +51,29 @@ #define cpu_to_le16(x) swab16(x) #define cpu_to_le32(x) swab32(x) #define cpu_to_le64(x) swab64(x) -#define cpu_to_be16(x) (x) -#define cpu_to_be32(x) (x) -#define cpu_to_be64(x) (x) +#define cpu_to_be16(x) ((uint16_t)(x)) +#define cpu_to_be32(x) ((uint32_t)(x)) +#define cpu_to_be64(x) ((uint64_t)(x)) #define le16_to_cpu(x) swab16(x) #define le32_to_cpu(x) swab32(x) #define le64_to_cpu(x) swab64(x) -#define be16_to_cpu(x) (x) -#define be32_to_cpu(x) (x) -#define be64_to_cpu(x) (x) +#define be16_to_cpu(x) ((uint16_t)(x)) +#define be32_to_cpu(x) ((uint32_t)(x)) +#define be64_to_cpu(x) ((uint64_t)(x)) #else /* !WORDS_BIGENDIAN */ -#define cpu_to_le16(x) (x) -#define cpu_to_le32(x) (x) -#define cpu_to_le64(x) (x) +#define cpu_to_le16(x) ((uint16_t)(x)) +#define cpu_to_le32(x) ((uint32_t)(x)) +#define cpu_to_le64(x) ((uint64_t)(x)) #define cpu_to_be16(x) swab16(x) #define cpu_to_be32(x) swab32(x) #define cpu_to_be64(x) swab64(x) -#define le16_to_cpu(x) (x) -#define le32_to_cpu(x) (x) -#define le64_to_cpu(x) (x) +#define le16_to_cpu(x) ((uint16_t)(x)) +#define le32_to_cpu(x) ((uint32_t)(x)) +#define le64_to_cpu(x) ((uint64_t)(x)) #define be16_to_cpu(x) swab16(x) #define be32_to_cpu(x) swab32(x) #define be64_to_cpu(x) swab64(x) |