summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Mahone <andrew.mahone@gmail.com>2009-06-06 00:58:57 +0000
committerAndrew Mahone <andrew.mahone@gmail.com>2009-06-06 00:58:57 +0000
commitc76d940c066c6fdb6a627529de4e745d0974232e (patch)
tree3f5df41a5a0ed5f7e470a555987efdc8bb034570
parentd2eb5d29017607f3cbf8d29d48e54364c1611c03 (diff)
downloadrockbox-c76d940c066c6fdb6a627529de4e745d0974232e.tar.gz
rockbox-c76d940c066c6fdb6a627529de4e745d0974232e.tar.bz2
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.h2
-rw-r--r--firmware/target/sh/system-target.h2
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)
#endif /* !SIMULATOR */
#ifndef BIT_N
-#define BIT_N(n) (1UL << (n))
+#define BIT_N(n) (1U << (n))
#endif
/* 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)
extern const unsigned bit_n_table[32];
#define BIT_N(n) ( \
__builtin_constant_p(n) \
- ? (1LU << (n)) \
+ ? (1U << (n)) \
: bit_n_table[n] \
)