[SCM] opencore-amr packaging branch, master, updated. upstream/0.1.2-10-g7bf1e45

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a60afd3679755e417ab7ca550f6907477a768a8e
Author: Martin Storsjo <martin at martin.st>
Date:   Tue Sep 1 12:49:03 2009 +0300

    Change some occurrances of __inline into static inline
    
    This eases compilation as C, to avoid undefined or multiply defined symbols
    
    Reapply change 10018 in the upstream repo, that had been merged before,
    but overwritten and not properly merged by the latest code drop.

diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/pvamrwbdecoder_basic_op.h b/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/pvamrwbdecoder_basic_op.h
index e653a98..7b9e900 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/pvamrwbdecoder_basic_op.h
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/pvamrwbdecoder_basic_op.h
@@ -75,7 +75,7 @@ terms listed above has been obtained from the copyright holder.
                range : 0x8000 <= var_out <= 0x7fff.
  ----------------------------------------------------------------------------*/
 
-__inline int16 negate_int16(int16 var1)
+static inline int16 negate_int16(int16 var1)
 {
     return (((var1 == MIN_16) ? MAX_16 : -var1));
 }
@@ -105,7 +105,7 @@ __inline int16 negate_int16(int16 var1)
                range : 0x8000 <= var_out <= 0x7fff.
  ----------------------------------------------------------------------------*/
 
-__inline int16 shl_int16(int16 var1, int16 var2)
+static inline int16 shl_int16(int16 var1, int16 var2)
 {
     int16 var_out;
 
@@ -149,7 +149,7 @@ __inline int16 shl_int16(int16 var1, int16 var2)
 
  ----------------------------------------------------------------------------*/
 
-__inline int32 shl_int32(int32 L_var1, int16 var2)
+static inline int32 shl_int32(int32 L_var1, int16 var2)
 {
     int32 L_var_out;
 
@@ -193,7 +193,7 @@ __inline int32 shl_int32(int32 L_var1, int16 var2)
 
  ----------------------------------------------------------------------------*/
 
-__inline int32 shr_int32(int32 L_var1, int16 var2)
+static inline int32 shr_int32(int32 L_var1, int16 var2)
 {
     int32 L_var_out;
 

-- 
opencore-amr packaging