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 | |
| parent | 908cdc68a1a4c236feb9f6c0604afe74e1ed0684 (diff) | |
| download | wireshark-5b1d142f52ab8f89f558ab18788637d3eefdd2bb.tar.gz | |
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')
| -rw-r--r-- | codecs/speex/arch.h | 2 | ||||
| -rw-r--r-- | codecs/speex/resample.c | 8 |
2 files changed, 6 insertions, 4 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. */ diff --git a/codecs/speex/resample.c b/codecs/speex/resample.c index 1faf88b0bd..0a903792f0 100644 --- a/codecs/speex/resample.c +++ b/codecs/speex/resample.c @@ -63,10 +63,10 @@ #define FLOATING_POINT 1 #ifdef OUTSIDE_SPEEX -#include <stdlib.h> -static void *speex_alloc (size_t size) {return calloc(size,1);} -static void *speex_realloc (void *ptr, size_t size) {return realloc(ptr, size);} -static void speex_free (void *ptr) {free(ptr);} +#include <glib.h> +static void *speex_alloc (size_t size) {return g_malloc0(size);} +static void *speex_realloc (void *ptr, size_t size) {return g_realloc(ptr, size);} +static void speex_free (void *ptr) {g_free(ptr);} #include "speex_resampler.h" #include "arch.h" #else /* OUTSIDE_SPEEX */ |