Commit 31f97ca4 authored by Jan Schmidt's avatar Jan Schmidt
Browse files

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
parent 1c2fae7f
2007-11-14 Jan Schmidt <jan.schmidt@sun.com>
* 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 <ensonic@users.sf.net> 2007-11-09 Stefan Kost <ensonic@users.sf.net>
   
* gst/playback/gstdecodebin2.c: * gst/playback/gstdecodebin2.c:
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <stdio.h> #include <stdio.h>
#include <math.h> #include <math.h>
#include <memory.h> #include <memory.h>
#include <malloc.h> #include <glib.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
...@@ -24,7 +24,7 @@ extern "C" { ...@@ -24,7 +24,7 @@ extern "C" {
in the tools/ directory. in the tools/ directory.
*/ */
#define KISS_FFT_F32_MALLOC malloc #define KISS_FFT_F32_MALLOC g_malloc
#define kiss_fft_f32_scalar float #define kiss_fft_f32_scalar float
typedef struct { typedef struct {
...@@ -78,7 +78,7 @@ void kiss_fft_f32_stride(kiss_fft_f32_cfg cfg,const kiss_fft_f32_cpx *fin,kiss_f ...@@ -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 /* If kiss_fft_f32_alloc allocated a buffer, it is one contiguous
buffer and can be simply free()d when no longer needed*/ 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 Cleans up some memory that gets managed internally. Not necessary to call, but it might clean up
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <stdio.h> #include <stdio.h>
#include <math.h> #include <math.h>
#include <memory.h> #include <memory.h>
#include <malloc.h> #include <glib.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
...@@ -24,7 +24,7 @@ extern "C" { ...@@ -24,7 +24,7 @@ extern "C" {
in the tools/ directory. in the tools/ directory.
*/ */
#define KISS_FFT_F64_MALLOC malloc #define KISS_FFT_F64_MALLOC g_malloc
#define kiss_fft_f64_scalar double #define kiss_fft_f64_scalar double
typedef struct { typedef struct {
...@@ -78,7 +78,7 @@ void kiss_fft_f64_stride(kiss_fft_f64_cfg cfg,const kiss_fft_f64_cpx *fin,kiss_f ...@@ -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 /* If kiss_fft_f64_alloc allocated a buffer, it is one contiguous
buffer and can be simply free()d when no longer needed*/ 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 Cleans up some memory that gets managed internally. Not necessary to call, but it might clean up
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <stdio.h> #include <stdio.h>
#include <math.h> #include <math.h>
#include <memory.h> #include <memory.h>
#include <malloc.h> #include <glib.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
...@@ -24,7 +24,7 @@ extern "C" { ...@@ -24,7 +24,7 @@ extern "C" {
in the tools/ directory. in the tools/ directory.
*/ */
#define KISS_FFT_S16_MALLOC malloc #define KISS_FFT_S16_MALLOC g_malloc
#include "_stdint.h" #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 ...@@ -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 /* If kiss_fft_s16_alloc allocated a buffer, it is one contiguous
buffer and can be simply free()d when no longer needed*/ 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 Cleans up some memory that gets managed internally. Not necessary to call, but it might clean up
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <stdio.h> #include <stdio.h>
#include <math.h> #include <math.h>
#include <memory.h> #include <memory.h>
#include <malloc.h> #include <glib.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
...@@ -24,7 +24,7 @@ extern "C" { ...@@ -24,7 +24,7 @@ extern "C" {
in the tools/ directory. in the tools/ directory.
*/ */
#define KISS_FFT_S32_MALLOC malloc #define KISS_FFT_S32_MALLOC g_malloc
#include "_stdint.h" #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 ...@@ -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 /* If kiss_fft_s32_alloc allocated a buffer, it is one contiguous
buffer and can be simply free()d when no longer needed*/ 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 Cleans up some memory that gets managed internally. Not necessary to call, but it might clean up
......
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