From 120800f8fa478d75ad9f94d91dae775386c6b0d5 Mon Sep 17 00:00:00 2001 From: Ralph Giles Date: Fri, 25 Nov 2011 13:02:00 -0800 Subject: 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. --- silk/typedef.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'silk/typedef.h') diff --git a/silk/typedef.h b/silk/typedef.h index 26fea652..e259d758 100644 --- a/silk/typedef.h +++ b/silk/typedef.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_TYPEDEF_H_ -#define _SILK_TYPEDEF_H_ +#ifndef SILK_TYPEDEF_H +#define SILK_TYPEDEF_H #include "opus_types.h" @@ -99,4 +99,4 @@ static inline void _silk_fatal(const char *str, const char *file, int line) # endif #endif -#endif +#endif /* SILK_TYPEDEF_H */ -- cgit v1.2.3