Commit dd541712 authored by schreibfaul1's avatar schreibfaul1

avoid "redefined" warnings

parent f790c7ed
...@@ -185,9 +185,12 @@ struct CELTMode { ...@@ -185,9 +185,12 @@ struct CELTMode {
}; };
extern const CELTMode m_CELTMode; extern const CELTMode m_CELTMode;
#ifndef _min
#define _min(a,b) ((a)<(b)?(a):(b)) #define _min(a,b) ((a)<(b)?(a):(b))
#define _max(a,b) ((a)>(b)?(a):(b)) #endif
#ifndef _max
#define _max(a,b) ((a)>(b)?(a):(b))
#endif
inline int32_t S_MUL(int32_t a, int16_t b){return (int64_t)b * a >> 15;} inline int32_t S_MUL(int32_t a, int16_t b){return (int64_t)b * a >> 15;}
#define C_MUL(m,a,b) do{ (m).r = SUB32_ovflw(S_MUL((a).r,(b).r) , S_MUL((a).i,(b).i)); \ #define C_MUL(m,a,b) do{ (m).r = SUB32_ovflw(S_MUL((a).r,(b).r) , S_MUL((a).i,(b).i)); \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment