summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/rbcodec/codecs/libtremor/oggmalloc.c8
-rw-r--r--lib/rbcodec/codecs/vorbis.c6
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/rbcodec/codecs/libtremor/oggmalloc.c b/lib/rbcodec/codecs/libtremor/oggmalloc.c
index 783e0f7240..31d88f191d 100644
--- a/lib/rbcodec/codecs/libtremor/oggmalloc.c
+++ b/lib/rbcodec/codecs/libtremor/oggmalloc.c
@@ -1,7 +1,7 @@
1#include "os_types.h" 1#include "os_types.h"
2#include <tlsf.h> 2#include <tlsf.h>
3 3
4#if defined(CPU_ARM) || defined(CPU_COLDFIRE) || defined(CPU_MIPS) 4#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
5#include <setjmp.h> 5#include <setjmp.h>
6extern jmp_buf rb_jump_buf; 6extern jmp_buf rb_jump_buf;
7#define LONGJMP(x) longjmp(rb_jump_buf, x) 7#define LONGJMP(x) longjmp(rb_jump_buf, x)
@@ -31,7 +31,7 @@ void *ogg_malloc(size_t size)
31 31
32 if (x == NULL) 32 if (x == NULL)
33 LONGJMP(1); 33 LONGJMP(1);
34 34
35 return x; 35 return x;
36} 36}
37 37
@@ -41,7 +41,7 @@ void *ogg_calloc(size_t nmemb, size_t size)
41 41
42 if (x == NULL) 42 if (x == NULL)
43 LONGJMP(1); 43 LONGJMP(1);
44 44
45 return x; 45 return x;
46} 46}
47 47
@@ -51,7 +51,7 @@ void *ogg_realloc(void *ptr, size_t size)
51 51
52 if (x == NULL) 52 if (x == NULL)
53 LONGJMP(1); 53 LONGJMP(1);
54 54
55 return x; 55 return x;
56} 56}
57 57
diff --git a/lib/rbcodec/codecs/vorbis.c b/lib/rbcodec/codecs/vorbis.c
index 83c9d5b31d..ce1f4ba893 100644
--- a/lib/rbcodec/codecs/vorbis.c
+++ b/lib/rbcodec/codecs/vorbis.c
@@ -28,7 +28,7 @@
28 28
29CODEC_HEADER 29CODEC_HEADER
30 30
31#if defined(CPU_ARM) || defined(CPU_COLDFIRE) || defined(CPU_MIPS) 31#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
32#include <setjmp.h> 32#include <setjmp.h>
33jmp_buf rb_jump_buf; 33jmp_buf rb_jump_buf;
34#endif 34#endif
@@ -135,7 +135,7 @@ enum codec_status codec_run(void)
135 ogg_int64_t vf_pcmlengths[2]; 135 ogg_int64_t vf_pcmlengths[2];
136 intptr_t param; 136 intptr_t param;
137 137
138#if defined(CPU_ARM) || defined(CPU_COLDFIRE) || defined(CPU_MIPS) 138#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
139 if (setjmp(rb_jump_buf) != 0) { 139 if (setjmp(rb_jump_buf) != 0) {
140 /* malloc failed; finish with this track */ 140 /* malloc failed; finish with this track */
141 goto done; 141 goto done;
@@ -153,7 +153,7 @@ enum codec_status codec_run(void)
153 153
154 /* Open a non-seekable stream */ 154 /* Open a non-seekable stream */
155 error = ov_open_callbacks(ci, &vf, NULL, 0, callbacks); 155 error = ov_open_callbacks(ci, &vf, NULL, 0, callbacks);
156 156
157 /* If the non-seekable open was successful, we need to supply the missing 157 /* If the non-seekable open was successful, we need to supply the missing
158 * data to make it seekable. This is a hack, but it's reasonable since we 158 * data to make it seekable. This is a hack, but it's reasonable since we
159 * don't want to run the whole file through the buffer before we start 159 * don't want to run the whole file through the buffer before we start