From 31f97ca497d07bbd2d1fec2b655fcf9df209bd67 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Wed, 14 Nov 2007 11:08:48 +0000 Subject: [PATCH] gst-libs/gst/fft/: Don't include malloc.h which doesn't exist on Mac OSX. Original commit message from CVS: * gst-libs/gst/fft/kiss_fft_f32.h: * gst-libs/gst/fft/kiss_fft_f64.h: * gst-libs/gst/fft/kiss_fft_s16.h: * gst-libs/gst/fft/kiss_fft_s32.h: Don't include malloc.h which doesn't exist on Mac OSX. Instead, pull in glib.h and use g_malloc/g_free for consistency. Fixes: #496548 --- ChangeLog | 10 ++++++++++ gst-libs/gst/fft/kiss_fft_f32.h | 6 +++--- gst-libs/gst/fft/kiss_fft_f64.h | 6 +++--- gst-libs/gst/fft/kiss_fft_s16.h | 6 +++--- gst-libs/gst/fft/kiss_fft_s32.h | 6 +++--- 5 files changed, 22 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index d7695e0..7c4f915 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-11-14 Jan Schmidt + + * gst-libs/gst/fft/kiss_fft_f32.h: + * gst-libs/gst/fft/kiss_fft_f64.h: + * gst-libs/gst/fft/kiss_fft_s16.h: + * gst-libs/gst/fft/kiss_fft_s32.h: + Don't include malloc.h which doesn't exist on Mac OSX. + Instead, pull in glib.h and use g_malloc/g_free for + consistency. Fixes: #496548 + 2007-11-09 Stefan Kost * gst/playback/gstdecodebin2.c: diff --git a/gst-libs/gst/fft/kiss_fft_f32.h b/gst-libs/gst/fft/kiss_fft_f32.h index cc3cdee..06a893d 100644 --- a/gst-libs/gst/fft/kiss_fft_f32.h +++ b/gst-libs/gst/fft/kiss_fft_f32.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include #ifdef __cplusplus extern "C" { @@ -24,7 +24,7 @@ extern "C" { in the tools/ directory. */ -#define KISS_FFT_F32_MALLOC malloc +#define KISS_FFT_F32_MALLOC g_malloc #define kiss_fft_f32_scalar float typedef struct { @@ -78,7 +78,7 @@ void kiss_fft_f32_stride(kiss_fft_f32_cfg cfg,const kiss_fft_f32_cpx *fin,kiss_f /* If kiss_fft_f32_alloc allocated a buffer, it is one contiguous buffer and can be simply free()d when no longer needed*/ -#define kiss_fft_f32_free free +#define kiss_fft_f32_free g_free /* Cleans up some memory that gets managed internally. Not necessary to call, but it might clean up diff --git a/gst-libs/gst/fft/kiss_fft_f64.h b/gst-libs/gst/fft/kiss_fft_f64.h index b3fb15a..572b33a 100644 --- a/gst-libs/gst/fft/kiss_fft_f64.h +++ b/gst-libs/gst/fft/kiss_fft_f64.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include #ifdef __cplusplus extern "C" { @@ -24,7 +24,7 @@ extern "C" { in the tools/ directory. */ -#define KISS_FFT_F64_MALLOC malloc +#define KISS_FFT_F64_MALLOC g_malloc #define kiss_fft_f64_scalar double typedef struct { @@ -78,7 +78,7 @@ void kiss_fft_f64_stride(kiss_fft_f64_cfg cfg,const kiss_fft_f64_cpx *fin,kiss_f /* If kiss_fft_f64_alloc allocated a buffer, it is one contiguous buffer and can be simply free()d when no longer needed*/ -#define kiss_fft_f64_free free +#define kiss_fft_f64_free g_free /* Cleans up some memory that gets managed internally. Not necessary to call, but it might clean up diff --git a/gst-libs/gst/fft/kiss_fft_s16.h b/gst-libs/gst/fft/kiss_fft_s16.h index ed735e6..9e22905 100644 --- a/gst-libs/gst/fft/kiss_fft_s16.h +++ b/gst-libs/gst/fft/kiss_fft_s16.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include #ifdef __cplusplus extern "C" { @@ -24,7 +24,7 @@ extern "C" { in the tools/ directory. */ -#define KISS_FFT_S16_MALLOC malloc +#define KISS_FFT_S16_MALLOC g_malloc #include "_stdint.h" @@ -81,7 +81,7 @@ void kiss_fft_s16_stride(kiss_fft_s16_cfg cfg,const kiss_fft_s16_cpx *fin,kiss_f /* If kiss_fft_s16_alloc allocated a buffer, it is one contiguous buffer and can be simply free()d when no longer needed*/ -#define kiss_fft_s16_free free +#define kiss_fft_s16_free g_free /* Cleans up some memory that gets managed internally. Not necessary to call, but it might clean up diff --git a/gst-libs/gst/fft/kiss_fft_s32.h b/gst-libs/gst/fft/kiss_fft_s32.h index 103eaf9..b1c1d70 100644 --- a/gst-libs/gst/fft/kiss_fft_s32.h +++ b/gst-libs/gst/fft/kiss_fft_s32.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include #ifdef __cplusplus extern "C" { @@ -24,7 +24,7 @@ extern "C" { in the tools/ directory. */ -#define KISS_FFT_S32_MALLOC malloc +#define KISS_FFT_S32_MALLOC g_malloc #include "_stdint.h" @@ -82,7 +82,7 @@ void kiss_fft_s32_stride(kiss_fft_s32_cfg cfg,const kiss_fft_s32_cpx *fin,kiss_f /* If kiss_fft_s32_alloc allocated a buffer, it is one contiguous buffer and can be simply free()d when no longer needed*/ -#define kiss_fft_s32_free free +#define kiss_fft_s32_free g_free /* Cleans up some memory that gets managed internally. Not necessary to call, but it might clean up -- 2.7.4