summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2007-11-18 23:17:39 +0000
committerMichael Sevakis <jethead71@rockbox.org>2007-11-18 23:17:39 +0000
commit371ebe11600da82437d25e9e2fb2ba2eaa5c3c37 (patch)
tree58131a8d8ad68fd203ce4616ceed50272d350a89
parentc31818ccf0d7acadb91e95ba02980ced209489e0 (diff)
downloadrockbox-371ebe11600da82437d25e9e2fb2ba2eaa5c3c37.tar.gz
rockbox-371ebe11600da82437d25e9e2fb2ba2eaa5c3c37.zip
libspeex: let DEBUGF work correctly for both core and codec builds
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15677 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/codecs/libspeex/rockbox.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/apps/codecs/libspeex/rockbox.h b/apps/codecs/libspeex/rockbox.h
index 0e0d3ed647..be441e3c3a 100644
--- a/apps/codecs/libspeex/rockbox.h
+++ b/apps/codecs/libspeex/rockbox.h
@@ -24,22 +24,21 @@
24 24
25#include "../codec.h" 25#include "../codec.h"
26#include "../lib/codeclib.h" 26#include "../lib/codeclib.h"
27#include "debug.h"
28
29#if !defined(ROCKBOX_VOICE_CODEC)
27 30
28#if defined(DEBUG) || defined(SIMULATOR) 31#if defined(DEBUG) || defined(SIMULATOR)
29#undef DEBUGF 32#undef DEBUGF
30#define DEBUGF ci->debugf 33#define DEBUGF ci->debugf
31#else
32#define DEBUGF(...)
33#endif 34#endif
34 35
35#ifdef ROCKBOX_HAS_LOGF 36#ifdef ROCKBOX_HAS_LOGF
36#undef LOGF 37#undef LOGF
37#define LOGF ci->logf 38#define LOGF ci->logf
38#else
39#define LOGF(...)
40#endif 39#endif
41 40
42extern struct codec_api* ci; 41#endif /* ROCKBOX_VOICE_CODEC */
43 42
44#define OVERRIDE_SPEEX_ALLOC 1 43#define OVERRIDE_SPEEX_ALLOC 1
45static inline void *speex_alloc (int size) 44static inline void *speex_alloc (int size)