[xiph-cvs] cvs commit: speex/libspeex nb_celp.c

[Jean-Marc Valin]

jm          02/11/02 10:27:24

  Modified:    libspeex nb_celp.c
  Log:
  To make the OpenH323 people happy (warning on Win32)

Revision  Changes    Path
1.77      +3 -1      speex/libspeex/nb_celp.c

Index: nb_celp.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/nb_celp.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- nb_celp.c	1 Nov 2002 03:50:50 -0000	1.76
+++ nb_celp.c	2 Nov 2002 15:27:24 -0000	1.77
@@ -61,10 +61,12 @@
 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)
 {

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.