diff options
| author | Andrew Mahone <andrew.mahone@gmail.com> | 2009-06-06 00:58:57 +0000 |
|---|---|---|
| committer | Andrew Mahone <andrew.mahone@gmail.com> | 2009-06-06 00:58:57 +0000 |
| commit | c76d940c066c6fdb6a627529de4e745d0974232e (patch) | |
| tree | 3f5df41a5a0ed5f7e470a555987efdc8bb034570 | |
| parent | d2eb5d29017607f3cbf8d29d48e54364c1611c03 (diff) | |
| download | rockbox-c76d940c066c6fdb6a627529de4e745d0974232e.tar.gz rockbox-c76d940c066c6fdb6a627529de4e745d0974232e.zip | |
Replace 1UL in BIT_N with 1U to avoid turning it into a 64-bit operation on 64-bit sim targets.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21197 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/export/system.h | 2 | ||||
| -rw-r--r-- | firmware/target/sh/system-target.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/firmware/export/system.h b/firmware/export/system.h index d5da2225d6..3216948997 100644 --- a/firmware/export/system.h +++ b/firmware/export/system.h | |||
| @@ -267,7 +267,7 @@ static inline uint32_t swap_odd_even32(uint32_t value) | |||
| 267 | #endif /* !SIMULATOR */ | 267 | #endif /* !SIMULATOR */ |
| 268 | 268 | ||
| 269 | #ifndef BIT_N | 269 | #ifndef BIT_N |
| 270 | #define BIT_N(n) (1UL << (n)) | 270 | #define BIT_N(n) (1U << (n)) |
| 271 | #endif | 271 | #endif |
| 272 | 272 | ||
| 273 | /* Declare this as HIGHEST_IRQ_LEVEL if they don't differ */ | 273 | /* Declare this as HIGHEST_IRQ_LEVEL if they don't differ */ |
diff --git a/firmware/target/sh/system-target.h b/firmware/target/sh/system-target.h index 2568911a1e..a84ce07af9 100644 --- a/firmware/target/sh/system-target.h +++ b/firmware/target/sh/system-target.h | |||
| @@ -129,7 +129,7 @@ static inline uint32_t swap_odd_even32(uint32_t value) | |||
| 129 | extern const unsigned bit_n_table[32]; | 129 | extern const unsigned bit_n_table[32]; |
| 130 | #define BIT_N(n) ( \ | 130 | #define BIT_N(n) ( \ |
| 131 | __builtin_constant_p(n) \ | 131 | __builtin_constant_p(n) \ |
| 132 | ? (1LU << (n)) \ | 132 | ? (1U << (n)) \ |
| 133 | : bit_n_table[n] \ | 133 | : bit_n_table[n] \ |
| 134 | ) | 134 | ) |
| 135 | 135 | ||