diff --git a/Source/Dexed.h b/Source/Dexed.h index d4989b04..0a129aca 100644 --- a/Source/Dexed.h +++ b/Source/Dexed.h @@ -27,18 +27,14 @@ void dexed_trace(const char *source, const char *fmt, ...); #ifdef DEBUG #define DEXED_VERSION DEXED_ID " DEBUG" - #ifndef TRACE - #ifdef _MSC_VER - #define TRACE(fmt, ...) dexed_trace(__FUNCTION__,fmt,##__VA_ARGS__) - #else - #define TRACE(fmt, ...) dexed_trace(__PRETTY_FUNCTION__,fmt,##__VA_ARGS__) - #endif + #ifdef _MSC_VER + #define TRACE(fmt, ...) dexed_trace(__FUNCTION__,fmt,##__VA_ARGS__) + #else + #define TRACE(fmt, ...) dexed_trace(__PRETTY_FUNCTION__,fmt,##__VA_ARGS__) #endif #else #define DEXED_VERSION DEXED_ID - #ifndef TRACE - #define TRACE(fmt, ...) - #endif + #define TRACE(fmt, ...) #endif #endif // DEXED_H_INCLUDED diff --git a/Source/msfa/synth.h b/Source/msfa/synth.h index d5832765..c64005b4 100644 --- a/Source/msfa/synth.h +++ b/Source/msfa/synth.h @@ -60,12 +60,12 @@ inline static T max(const T& a, const T& b) { void dexed_trace(const char *source, const char *fmt, ...); #define QER(n,b) ( ((float)n)/(1<