summaryrefslogtreecommitdiff
path: root/lib/rbcodec/codecs/vorbis.c
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2021-03-04 08:59:17 -0500
committerSolomon Peachy <pizza@shaftnet.org>2021-03-04 14:14:33 +0000
commit2628155fc9947dcf463938553f057c39ccc2227a (patch)
tree2f852f1668c5ed94d86ea53ad89c646884490044 /lib/rbcodec/codecs/vorbis.c
parent15b4d229139d2f596ba18ca3331f0ce9c7134cb4 (diff)
downloadrockbox-2628155fc9947dcf463938553f057c39ccc2227a.tar.gz
rockbox-2628155fc9947dcf463938553f057c39ccc2227a.zip
Clean up places that use #if defined(CPU_ARM | CPU_COLDFIRE | CPU_MIPS)
Since that encompasses _all_ of our native targets in a post-archos world, either replace it with #if (CONFIG_PLATFORM & PLATFORM_NATIVE) or delete it altogher as appropriate. Change-Id: I9128a456e850d5c96a9e05806aad3acd923f90c5
Diffstat (limited to 'lib/rbcodec/codecs/vorbis.c')
-rw-r--r--lib/rbcodec/codecs/vorbis.c6
1 files changed, 3 insertions, 3 deletions
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