diff options
Diffstat (limited to 'apps/codecs')
| -rw-r--r-- | apps/codecs/lib/codeclib.h | 3 | ||||
| -rw-r--r-- | apps/codecs/libspeex/arch.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/apps/codecs/lib/codeclib.h b/apps/codecs/lib/codeclib.h index 52bf72f..e7f45d3 100644 --- a/apps/codecs/lib/codeclib.h +++ b/apps/codecs/lib/codeclib.h @@ -58,9 +58,6 @@ int strcmp(const char *, const char *); void qsort(void *base, size_t nmemb, size_t size, int(*compar)(const void *, const void *)); -#define abs(x) ((x)>0?(x):-(x)) -#define labs(x) abs(x) - /*MDCT library functions*/ extern void mdct_backward(int n, int32_t *in, int32_t *out); diff --git a/apps/codecs/libspeex/arch.h b/apps/codecs/libspeex/arch.h index 9f81e0c..35b5363 100644 --- a/apps/codecs/libspeex/arch.h +++ b/apps/codecs/libspeex/arch.h @@ -80,6 +80,7 @@ #include "speex/speex_types.h" #endif +#undef ABS #define ABS(x) ((x) < 0 ? (-(x)) : (x)) /**< Absolute integer value. */ #define ABS16(x) ((x) < 0 ? (-(x)) : (x)) /**< Absolute 16-bit value. */ #define MIN16(a,b) ((a) < (b) ? (a) : (b)) /**< Maximum 16-bit value. */ |