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/MacroDebug.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/MacroDebug.h')
| -rw-r--r-- | silk/MacroDebug.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/silk/MacroDebug.h b/silk/MacroDebug.h index e407b808..8adf44e1 100644 --- a/silk/MacroDebug.h +++ b/silk/MacroDebug.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 _MACRO_DEBUG_H_ -#define _MACRO_DEBUG_H_ +#ifndef MACRO_DEBUG_H +#define MACRO_DEBUG_H /* Redefine macro functions with extensive assertion in DEBUG mode. As functions can't be undefined, this file can't work with SigProcFIX_MacroCount.h */ @@ -566,4 +566,4 @@ static inline opus_int32 silk_CHECK_FIT32( opus_int64 a ){ */ #endif -#endif /* _MACRO_DEBUG_H_ */ +#endif /* MACRO_DEBUG_H */ |