6
are taken from http://svn.xiph.org/trunk/speex/ revision 14232.
10
--- speex/libspeex/arch.h 2007-11-21 11:05:46.000000000 +0100
11
+++ speexresample/arch.h 2007-11-20 05:41:09.000000000 +0100
13
#include "speex/speex_types.h"
17
#define ABS(x) ((x) < 0 ? (-(x)) : (x)) /**< Absolute integer value. */
19
#define ABS16(x) ((x) < 0 ? (-(x)) : (x)) /**< Absolute 16-bit value. */
20
#define MIN16(a,b) ((a) < (b) ? (a) : (b)) /**< Maximum 16-bit value. */
21
#define MAX16(a,b) ((a) > (b) ? (a) : (b)) /**< Maximum 16-bit value. */
23
--- speex/include/speex/speex_resampler.h 2007-11-21 11:05:44.000000000 +0100
24
+++ speexresample/speex_resampler.h 2007-11-21 11:10:02.000000000 +0100
31
/********* WARNING: MENTAL SANITY ENDS HERE *************/
33
/* If the resampler is defined outside of Speex, we change the symbol names so that
35
#define speex_resampler_reset_mem CAT_PREFIX(RANDOM_PREFIX,_resampler_reset_mem)
36
#define speex_resampler_strerror CAT_PREFIX(RANDOM_PREFIX,_resampler_strerror)
38
-#define spx_int16_t short
39
-#define spx_int32_t int
40
-#define spx_uint16_t unsigned short
41
-#define spx_uint32_t unsigned int
42
+#define spx_int16_t gint16
43
+#define spx_int32_t gint32
44
+#define spx_uint16_t guint16
45
+#define spx_uint32_t guint32
47
#else /* OUTSIDE_SPEEX */
49
--- speex/libspeex/resample.c 2007-11-25 14:15:38.000000000 +0100
50
+++ speexresample/resample.c 2007-11-25 14:15:31.000000000 +0100
59
speex_alloc (int size)
61
- return calloc (size, 1);
62
+ return g_malloc0 (size);
66
speex_realloc (void *ptr, int size)
68
- return realloc (ptr, size);
69
+ return g_realloc (ptr, size);
74
speex_free (void *ptr)
80
#include "speex_resampler.h"