Updating Opus to release 1.1

silk/encode_pulses.c

 /***********************************************************************
 Copyright (c) 2006-2011, Skype Limited. All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
 - Redistributions of source code must retain the above copyright notice,
 this list of conditions and the following disclaimer.
 - Redistributions in binary form must reproduce the above copyright
 notice, this list of conditions and the following disclaimer in the
 documentation and/or other materials provided with the distribution.
@@ skipping 18 matching lines @@
 #include "config.h"
 #endif
 
 #include "main.h"
 #include "stack_alloc.h"
 
 /*********************************************/
 /* Encode quantization indices of excitation */
 /*********************************************/
 
-static inline opus_int combine_and_check(    /* return ok                           */
+static OPUS_INLINE opus_int combine_and_check(    /* return ok                           */
     opus_int         *pulses_comb,           /* O                                   */
     const opus_int   *pulses_in,             /* I                                   */
     opus_int         max_pulses,             /* I    max value for sum of pulses    */
     opus_int         len                     /* I    number of output values        */
 )
 {
     opus_int k, sum;
 
     for( k = 0; k < len; k++ ) {
         sum = pulses_in[ 2 * k ] + pulses_in[ 2 * k + 1 ];
@@ skipping 147 matching lines @@
             }
         }
     }
 
     /****************/
     /* Encode signs */
     /****************/
     silk_encode_signs( psRangeEnc, pulses, frame_length, signalType, quantOffsetType, sum_pulses );
     RESTORE_STACK;
 }