summaryrefslogtreecommitdiffstats
path: root/rbutil
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2016-03-20 11:04:27 +0100
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2016-03-27 12:38:17 +0200
commit8624392f7ecb6c3126d1bd84c6857a2986a0fa08 (patch)
treed90d5413e09459d08906afdef33f3d9e90f7b725 /rbutil
parent7cc6d85df906f6780fc2a7055938580b4ee51d8a (diff)
downloadrockbox-8624392f7ecb6c3126d1bd84c6857a2986a0fa08.tar.gz
rockbox-8624392f7ecb6c3126d1bd84c6857a2986a0fa08.tar.bz2
rockbox-8624392f7ecb6c3126d1bd84c6857a2986a0fa08.zip
Fix compile warning on OS X.
Current clang on OS X suggests placing parens so add them (-Wbitwise-op-parentheses enabled by default). Change-Id: I31b49386aa184fe27f72f7f58909b97524d96f44
Diffstat (limited to 'rbutil')
-rw-r--r--rbutil/rbutilqt/base/ttscarbon.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/base/ttscarbon.cpp b/rbutil/rbutilqt/base/ttscarbon.cpp
index a01d402cd4..2d9fa49dbe 100644
--- a/rbutil/rbutilqt/base/ttscarbon.cpp
+++ b/rbutil/rbutilqt/base/ttscarbon.cpp
@@ -249,7 +249,7 @@ unsigned long TTSCarbon::be2u32(unsigned char* buf)
unsigned long TTSCarbon::be2u16(unsigned char* buf)
{
- return buf[1]&0xff | (buf[0]&0xff)<<8;
+ return (buf[1]&0xff) | (buf[0]&0xff)<<8;
}