diff options
| author | Ralph Giles <giles@mozilla.com> | 2011-12-01 02:11:23 +0400 |
|---|---|---|
| committer | Ralph Giles <giles@mozilla.com> | 2012-03-06 05:09:54 +0400 |
| commit | b46991c34f3587a06957a627d1e3095bf711851e (patch) | |
| tree | e8e5db8e8bc164f00a5347acfff1abe9c898935c | |
| parent | a855a1f0ff5e96a22c5ccce4276891e749cb3955 (diff) | |
Restore the windows-side #ifdef check in silk/MacroDebug.h.
We still override the '#if 0' with FIXED_DEBUG, but this
leaves whatever Koen intended here more intact. Suggestion
from Greg Maxwell.
| -rw-r--r-- | silk/MacroDebug.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/silk/MacroDebug.h b/silk/MacroDebug.h index 8e06b2e8..f804902c 100644 --- a/silk/MacroDebug.h +++ b/silk/MacroDebug.h @@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /* Redefine macro functions with extensive assertion in DEBUG mode. As functions can't be undefined, this file can't work with SigProcFIX_MacroCount.h */ -#if defined (FIXED_DEBUG) && !defined (silk_MACRO_COUNT) +#if ( defined (FIXED_DEBUG) || ( 0 && defined (_DEBUG) ) ) && !defined (silk_MACRO_COUNT) #undef silk_ADD16 static inline opus_int16 silk_ADD16(opus_int16 a, opus_int16 b){ |