diff options
| author | Ralph Giles <giles@mozilla.com> | 2011-11-26 01:02:00 +0400 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2011-12-02 21:31:36 +0400 |
| commit | 120800f8fa478d75ad9f94d91dae775386c6b0d5 (patch) | |
| tree | 12d06687371998fa8d682443f25b3f1d1ac6a054 /silk/macros.h | |
| parent | e1be1920bac28c897a940be55319abbb1bed0f51 (diff) | |
Rename '_FOO' to avoid potentional collisions with reserved identifiers.
C reserves identifiers of the from _[A-Z]+ and we have a number of
those in the code. This patch renames the various function arguments,
MACROS and preprocessor symbols to avoid the reserved form.
It also removes the CHANNELS() macro altogether. This was a
minor optimization for TI DSP to force a mono-only build,
as were the associated local 'const' versions. Since stereo
support is manditory, it wasn't worth keeping.
Thanks to John Ridges for raising the issue, and Jean-Marc Valin
and Greg Maxwell for reviewing the changes.
Diffstat (limited to 'silk/macros.h')
| -rw-r--r-- | silk/macros.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/silk/macros.h b/silk/macros.h index 9135ddea..e3ab0e7f 100644 --- a/silk/macros.h +++ b/silk/macros.h @@ -25,8 +25,8 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef _SILK_API_C_H_ -#define _SILK_API_C_H_ +#ifndef SILK_API_C_H +#define SILK_API_C_H /* This is an inline header file for general platform. */ @@ -128,5 +128,5 @@ static inline opus_int32 silk_CLZ32(opus_int32 in32) #endif #define matrix_c_adr(Matrix_base_adr, row, column, M) (Matrix_base_adr + ((row)+(M)*(column))) -#endif /* _SILK_API_C_H_ */ +#endif /* SILK_API_C_H */ |