symbol collided

Author: NishiOwO

include/hlsyn.h

@@ -50,8 +50,8 @@
 #include "flavor.h"
 #include "hlsynapi.h"
 
-#define DEBUG
-#undef DEBUG
+//#define DEBUG
+//#undef DEBUG
 
 #define WARNINGS
 #undef WARNINGS

src/brent.c

@@ -23,7 +23,7 @@
 #pragma arm section code="BRENTCODE", rwdata="BRENTRWDATA", rodata="BRENTRODATA", zidata="BRENTDATA"
 #endif
 
-#if (defined(DEBUG) && !defined(UNDER_CE)) || (defined(WARNINGS) && !defined(UNDER_CE)) 
+#if (defined(DEBUG_OLD) && !defined(UNDER_CE)) || (defined(WARNINGS) && !defined(UNDER_CE)) 
 #include <stdio.h>	/* for printf on error */
 #include <stdlib.h>	/* for exit on error */
 #include <process.h>	/* for exit on error */
@@ -42,7 +42,7 @@ BrentBracket(BrentFunctionType* pF, void* pOtherArgs,
   short j;
   float f1,f2;
 
-#ifdef DEBUG
+#ifdef DEBUG_OLD
   if( fabs(*x1 - *x2) < FLOAT_EPS ){
     (void) printf("Bad initial range in BrentBracket()\n");
     exit(1);
@@ -84,7 +84,7 @@ Brent(BrentFunctionType* pF, void* pOtherArgs,
 	float fb=(*pF)(b,pOtherArgs);
   float fc,p,q,r,s,tol1,xm;
 
-#ifdef DEBUG
+#ifdef DEBUG_OLD
   if(fb*fa > 0.0f){
     (void) printf(" Root must be bracketed in Brent.");
     exit(1);
@@ -168,7 +168,7 @@ Brent(BrentFunctionType* pF, void* pOtherArgs,
 
     fb=(*pF)(b,pOtherArgs);
   }
-#ifdef DEBUG
+#ifdef DEBUG_OLD
   (void) printf("Maximum number of iterations exceeded in Brent.");
   exit(1);
 #endif

src/circuit.c

@@ -45,7 +45,7 @@
 #pragma arm section code="CIRCODE", rwdata="CIRRWDATA", rodata="CIRRODATA", zidata="CIRDATA"
 #endif
 
-#if (defined(DEBUG) && !defined(UNDER_CE)) || (defined(WARNINGS) && !defined(UNDER_CE)) 
+#if (defined(DEBUG_OLD) && !defined(UNDER_CE)) || (defined(WARNINGS) && !defined(UNDER_CE)) 
 
 #include <stdio.h>	/* for printf on error */
 #include <stdlib.h>	/* for exit on error */
@@ -272,7 +272,7 @@ if( state->Pm > 100.0f)
           &MinGuess, &MaxGuess, BRENT_BRACKET_DEFAULT_FACTOR,
           BRENT_BRACKET_DEFAULT_NTRY);
     if(!BracketReturn){
-#ifdef DEBUG
+#ifdef DEBUG_OLD
       printf("Unable to bracket root of Pm Root Function\n");
       exit(1);
 #endif

src/hlframe.c

@@ -66,7 +66,7 @@
 
 #include "flavor.h"
 
-#if (defined(DEBUG) && !defined(UNDER_CE)) || (defined(WARNINGS) && !defined(UNDER_CE)) 
+#if (defined(DEBUG_OLD) && !defined(UNDER_CE)) || (defined(WARNINGS) && !defined(UNDER_CE)) 
 #include <stdio.h>	/* for printf on error */
 #include <stdlib.h>	/* for exit on error */
 #include <process.h>	/* for exit on error */
@@ -327,7 +327,7 @@ FricativeFilters(HLFrame *frame,HLSpeaker *speaker,HLState *state,
 
 				else
 				{
-#ifdef DEBUG
+#ifdef DEBUG_OLD
 		   if(frame->f2 > (speaker->PalVelar_f2Offset 
 					  + speaker->PalVelar_f2Overf3_Slope * frame->f3))
 				  {
@@ -357,7 +357,7 @@ FricativeFilters(HLFrame *frame,HLSpeaker *speaker,HLState *state,
 	  llframe->NA3F = (short)speaker->LateralA3F;
         break;
 
-#ifdef DEBUG
+#ifdef DEBUG_OLD
       default:
         printf(" Should not reach default (FricativeGains)");
         exit(1);

src/inithl.c

@@ -44,7 +44,7 @@
 
 #include "flavor.h"
 
-#if (defined(DEBUG) && !defined(UNDER_CE)) || (defined(WARNINGS) && !defined(UNDER_CE)) 
+#if (defined(DEBUG_OLD) && !defined(UNDER_CE)) || (defined(WARNINGS) && !defined(UNDER_CE)) 
 
 #include <stdlib.h>	/* for exit on error */
 #include <process.h>	/* for exit on error */
@@ -652,12 +652,12 @@ Atf3Setf2Range(HLSpeaker *speaker,short f3,short f2Min,short f2Max,
       if(AB>0)
         ALVEOLAR(f2,f3Scaled).AB=AB;
     }
-#ifdef DEBUG		
+#ifdef DEBUG_OLD		
       else{
         printf("Try to write out of alveolar range.");
         exit(1);
       }
 #endif
   }
 }
-#endif
+#endif

src/nasalf1x.c

@@ -46,7 +46,7 @@
 
 #include "flavor.h"
 
-#if (defined(DEBUG) && !defined(UNDER_CE)) || (defined(WARNINGS) && !defined(UNDER_CE)) 
+#if (defined(DEBUG_OLD) && !defined(UNDER_CE)) || (defined(WARNINGS) && !defined(UNDER_CE)) 
 
 #include <stdio.h>	/* for printf on error */
 #include <stdlib.h>	/* for exit on error */
@@ -158,7 +158,7 @@ NasalZero(HLFrame *frame,HLSpeaker *speaker,HLState *state,
   *pFNZ = fn * (float) DTsqrt((1.f + MmOverMn) 
                             / (1.f + MmOverMn * fn * fn /(fm * fm)) );
 
-#ifdef DEBUG
+#ifdef DEBUG_OLD
   if(!( (fn > *pFNZ && fm < *pFNZ) 
     || (fn < *pFNZ && fm > *pFNZ))){
 
@@ -251,7 +251,7 @@ InterpolateTable(TableRow TheTable[],short TableLength,
     }
 
   if(Column2Set==NO){
-#ifdef DEBUG
+#ifdef DEBUG_OLD
     printf(" InterpolateTable finished without a value.");
     exit(1);
 #endif
@@ -266,7 +266,7 @@ LinearInterpolate(float x,float x1,float y1,float x2,float y2)
 {
   float Slope,yIntercept;
 
-#ifdef DEBUG
+#ifdef DEBUG_OLD
   if( (x2-x1) == 0.0f ){
     printf(" Cannot linear interpolate equal x values.");
     exit(1);
@@ -356,7 +356,7 @@ NasalFirstFormant(HLFrame *frame,HLSpeaker *speaker,HLState *state,
   if( fabs(Qf1c + Qfno) < FLOAT_EPS )
     {
     *pf1x = (state->f1c + speaker->fno) / 2.0f; /* a guess */
-#ifdef DEBUG
+#ifdef DEBUG_OLD
     printf("Zero division in NasalFirstFormant.\n");
     exit(1);
 #endif
@@ -415,7 +415,7 @@ NasalPole(HLFrame *frame,HLSpeaker *speaker,HLState *state,
   else
     FNPvars.fp = (float)(frame->f2 - 100.f);
 
-#ifdef DEBUG
+#ifdef DEBUG_OLD
   if(FNPvars.fp==FNPvars.fn){
     printf("fp must not equal fn in NasalPole.");
     exit(1);
@@ -444,7 +444,7 @@ NasalPole(HLFrame *frame,HLSpeaker *speaker,HLState *state,
                 (float)FNP_TOL,ITMAX,(float)EPS);
     else{
       *pFNP = 0.5f * (FNPvars.fp + FNPvars.fn); /* rough guess */
-#ifdef DEBUG
+#ifdef DEBUG_OLD
       printf("Unable to bracket nasal pole");
       exit(1);
 #endif
@@ -491,7 +491,7 @@ NOT_FINITE_BRACKETED if not.
   short i;
 
 
-#ifdef DEBUG
+#ifdef DEBUG_OLD
   if(FNPvars->fn>=FNPvars->fp){
     printf("fn must be less than fp in FiniteBracketFNP");
     exit(1);