diff options
author | Ralph Giles <giles@mozilla.com> | 2011-11-25 13:02:00 -0800 |
---|---|---|
committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2011-12-02 12:31:36 -0500 |
commit | 120800f8fa478d75ad9f94d91dae775386c6b0d5 (patch) | |
tree | 12d06687371998fa8d682443f25b3f1d1ac6a054 /celt/rate.h | |
parent | e1be1920bac28c897a940be55319abbb1bed0f51 (diff) | |
download | libopus-120800f8fa478d75ad9f94d91dae775386c6b0d5.tar.gz |
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 'celt/rate.h')
-rw-r--r-- | celt/rate.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/celt/rate.h b/celt/rate.h index d19d0b30..30c3cc1a 100644 --- a/celt/rate.h +++ b/celt/rate.h @@ -96,6 +96,6 @@ static inline int pulses2bits(const CELTMode *m, int band, int LM, int pulses) @return Total number of bits allocated */ int compute_allocation(const CELTMode *m, int start, int end, const int *offsets, const int *cap, int alloc_trim, int *intensity, int *dual_stero, - opus_int32 total, opus_int32 *balance, int *pulses, int *ebits, int *fine_priority, int _C, int LM, ec_ctx *ec, int encode, int prev); + opus_int32 total, opus_int32 *balance, int *pulses, int *ebits, int *fine_priority, int C, int LM, ec_ctx *ec, int encode, int prev); #endif |