diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2015-10-04 11:52:26 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-10-05 03:21:46 +0000 |
| commit | 5b1d142f52ab8f89f558ab18788637d3eefdd2bb (patch) | |
| tree | da98a23d9b02473941060f205a0b67e7eff863ad /codecs/speex/arch.h | |
| parent | 908cdc68a1a4c236feb9f6c0604afe74e1ed0684 (diff) | |
Fix warnings introduced by "Qt: Initial RTP playback"
Change-Id: I28ae077be535f32ef81ac370d6782033f219017d
Reviewed-on: https://code.wireshark.org/review/10777
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'codecs/speex/arch.h')
| -rw-r--r-- | codecs/speex/arch.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/codecs/speex/arch.h b/codecs/speex/arch.h index e160663ee1..eaad6b9260 100644 --- a/codecs/speex/arch.h +++ b/codecs/speex/arch.h @@ -70,7 +70,9 @@ #include "speex/speexdsp_types.h" #endif +#ifndef ABS /* already defined by glib.h */ #define ABS(x) ((x) < 0 ? (-(x)) : (x)) /**< Absolute integer value. */ +#endif #define ABS16(x) ((x) < 0 ? (-(x)) : (x)) /**< Absolute 16-bit value. */ #define MIN16(a,b) ((a) < (b) ? (a) : (b)) /**< Maximum 16-bit value. */ #define MAX16(a,b) ((a) > (b) ? (a) : (b)) /**< Maximum 16-bit value. */ |