diff options
| author | Lajos Molnar <lajos@google.com> | 2014-12-09 14:41:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-09 14:41:17 +0000 |
| commit | 33cc5c91e4bb9152ed122afacf7423e085420ac8 (patch) | |
| tree | ba4b32395614a947b40d9efe0cb6ff38600dc51f /media/libstagefright/codecs/amrnb/common/include/basic_op_c_equivalent.h | |
| parent | 853bc5a2379a59859795027a9dd4bc11a54b2a5f (diff) | |
| parent | f143b60856d275a9dcda1f3084c768655b242022 (diff) | |
| download | frameworks_av-33cc5c91e4bb9152ed122afacf7423e085420ac8.zip frameworks_av-33cc5c91e4bb9152ed122afacf7423e085420ac8.tar.gz frameworks_av-33cc5c91e4bb9152ed122afacf7423e085420ac8.tar.bz2 | |
am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 mode"
* commit 'f143b60856d275a9dcda1f3084c768655b242022':
Fix build with clang in C++11 mode
Diffstat (limited to 'media/libstagefright/codecs/amrnb/common/include/basic_op_c_equivalent.h')
| -rw-r--r-- | media/libstagefright/codecs/amrnb/common/include/basic_op_c_equivalent.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/media/libstagefright/codecs/amrnb/common/include/basic_op_c_equivalent.h b/media/libstagefright/codecs/amrnb/common/include/basic_op_c_equivalent.h index 35638e3..c4e4d4f 100644 --- a/media/libstagefright/codecs/amrnb/common/include/basic_op_c_equivalent.h +++ b/media/libstagefright/codecs/amrnb/common/include/basic_op_c_equivalent.h @@ -115,7 +115,7 @@ extern "C" Returns: L_sum = 32-bit sum of L_var1 and L_var2 (Word32) */ - static inline Word32 L_add(register Word32 L_var1, register Word32 L_var2, Flag *pOverflow) + static inline Word32 L_add(Word32 L_var1, Word32 L_var2, Flag *pOverflow) { Word32 L_sum; @@ -154,8 +154,8 @@ extern "C" Returns: L_diff = 32-bit difference of L_var1 and L_var2 (Word32) */ - static inline Word32 L_sub(register Word32 L_var1, register Word32 L_var2, - register Flag *pOverflow) + static inline Word32 L_sub(Word32 L_var1, Word32 L_var2, + Flag *pOverflow) { Word32 L_diff; @@ -246,7 +246,7 @@ extern "C" */ static inline Word32 L_mult(Word16 var1, Word16 var2, Flag *pOverflow) { - register Word32 L_product; + Word32 L_product; L_product = (Word32) var1 * var2; @@ -452,7 +452,7 @@ extern "C" */ static inline Word16 mult(Word16 var1, Word16 var2, Flag *pOverflow) { - register Word32 product; + Word32 product; product = ((Word32) var1 * var2) >> 15; |