To make the OpenH323 people happy (warning on Win32)
authorjm <jm@0101bb08-14d6-0310-b084-bc0e0c8e3800>
Sat, 2 Nov 2002 15:27:24 +0000 (15:27 +0000)
committerjm <jm@0101bb08-14d6-0310-b084-bc0e0c8e3800>
Sat, 2 Nov 2002 15:27:24 +0000 (15:27 +0000)
git-svn-id: http://svn.xiph.org/trunk/speex@4079 0101bb08-14d6-0310-b084-bc0e0c8e3800

libspeex/nb_celp.c

index 689ef89..53f1cba 100644 (file)
@@ -61,10 +61,12 @@ extern int training_weight;
 float exc_gain_quant_scal3[8]={-2.794750, -1.810660, -1.169850, -0.848119, -0.587190, -0.329818, -0.063266, 0.282826};
 
 float exc_gain_quant_scal1[2]={-0.35, 0.05};
-/*float exc_gain_quant_scal1[2]={-0.35, 0.05};*/
 
 #define sqr(x) ((x)*(x))
+
+#ifndef min
 #define min(a,b) ((a) < (b) ? (a) : (b))
+#endif
 
 void *nb_encoder_init(SpeexMode *m)
 {