Fix warning messages in GSM and speex because of previous update to GSM patchlevel 10 and speex 1.1.12

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@523 74dad513-b988-da41-8d7b-12977e46ad98

5 files changed, 12 insertions, 7 deletions

diff --git a/pjmedia/src/pjmedia-codec/gsm/proto.h b/pjmedia/src/pjmedia-codec/gsm/proto.h
index 2851c086..2caa0154 100644
--- a/pjmedia/src/pjmedia-codec/gsm/proto.h
+++ b/pjmedia/src/pjmedia-codec/gsm/proto.h
@@ -20,6 +20,11 @@
 #ifdef	_NO_PROTO
 #	undef	NeedFunctionPrototypes
 #endif
+

+/* PJMEDIA: always use NeedFunctionPrototypes */

+#ifndef NeedFunctionPrototypes

+#	define NeedFunctionPrototypes	1

+#endif

 
 #undef	P	/* gnu stdio.h actually defines this... 	*/
 #undef	P0
diff --git a/pjmedia/src/pjmedia-codec/gsm/rpe.c b/pjmedia/src/pjmedia-codec/gsm/rpe.c
index eda4f18e..90563dbe 100644
--- a/pjmedia/src/pjmedia-codec/gsm/rpe.c
+++ b/pjmedia/src/pjmedia-codec/gsm/rpe.c
@@ -298,7 +298,7 @@ static void APCM_quantization P5((xM,xMc,mant_out,exp_out,xmaxc_out),
 	temp = exp + 5;
 
 	assert(temp <= 11 && temp >= 0);
-	xmaxc = gsm_add( SASR(xmax, temp), exp << 3 );
+	xmaxc = gsm_add( (word)SASR(xmax, temp), (word)(exp << 3) );
 
 	/*   Quantizing and coding of the xM[0..12] RPE sequence
 	 *   to get the xMc[0..12]
diff --git a/pjmedia/src/pjmedia-codec/speex/jitter.c b/pjmedia/src/pjmedia-codec/speex/jitter.c
index 55a0833f..2860c109 100644
--- a/pjmedia/src/pjmedia-codec/speex/jitter.c
+++ b/pjmedia/src/pjmedia-codec/speex/jitter.c
@@ -220,7 +220,7 @@ void speex_jitter_get(SpeexJitter *jitter, short *out, int *current_timestamp)
       jitter->shortterm_margin[0] = 0;
       jitter->longterm_margin[0] = 0;            
       /*fprintf (stderr, "interpolate frame\n");*/
-      speex_decode_int(jitter->dec, NULL, out);
+      speex_decode_int(jitter->dec, NULL, (spx_int16_t*)out);
       if (current_timestamp)
          *current_timestamp = jitter->pointer_timestamp;
       return;
@@ -268,7 +268,7 @@ void speex_jitter_get(SpeexJitter *jitter, short *out, int *current_timestamp)
       if (jitter->valid_bits)
       {
          /* Try decoding last received packet */
-         ret = speex_decode_int(jitter->dec, &jitter->current_packet, out);
+         ret = speex_decode_int(jitter->dec, &jitter->current_packet, (spx_int16_t*)out);
          if (ret == 0)
          {
             jitter->lost_count = 0;
@@ -280,7 +280,7 @@ void speex_jitter_get(SpeexJitter *jitter, short *out, int *current_timestamp)
 
       /*fprintf (stderr, "lost/late frame %d\n", jitter->pointer_timestamp);*/
       /*Packet is late or lost*/
-      speex_decode_int(jitter->dec, NULL, out);
+      speex_decode_int(jitter->dec, NULL, (spx_int16_t*)out);
       jitter->lost_count++;
       if (jitter->lost_count>=25)
       {
@@ -295,7 +295,7 @@ void speex_jitter_get(SpeexJitter *jitter, short *out, int *current_timestamp)
       speex_bits_read_from(&jitter->current_packet, jitter->buf[i], jitter->len[i]);
       jitter->len[i]=-1;
       /* Decode packet */
-      ret = speex_decode_int(jitter->dec, &jitter->current_packet, out);
+      ret = speex_decode_int(jitter->dec, &jitter->current_packet, (spx_int16_t*)out);
       if (ret == 0)
       {
          jitter->valid_bits = 1;
diff --git a/pjmedia/src/pjmedia-codec/speex/kiss_fft.c b/pjmedia/src/pjmedia-codec/speex/kiss_fft.c
index d6763dbc..bea55ee8 100644
--- a/pjmedia/src/pjmedia-codec/speex/kiss_fft.c
+++ b/pjmedia/src/pjmedia-codec/speex/kiss_fft.c
@@ -87,7 +87,7 @@ static void kf_bfly4(
     if (!st->inverse) {
        int i;
        kiss_fft_cpx *x=Fout;
-       for (i=0;i<4*m;i++)
+       for (i=0;i<(int)(4*m);i++)
        {
           x[i].r = PSHR16(x[i].r,2);
           x[i].i = PSHR16(x[i].i,2);
diff --git a/pjmedia/src/pjmedia-codec/speex/mdf.c b/pjmedia/src/pjmedia-codec/speex/mdf.c
index 7895927b..0e7219ca 100644
--- a/pjmedia/src/pjmedia-codec/speex/mdf.c
+++ b/pjmedia/src/pjmedia-codec/speex/mdf.c
@@ -416,7 +416,7 @@ void speex_echo_cancel(SpeexEchoState *st, short *ref, short *echo, short *out,
    M_1 = 1.f/M;
 #endif
 
-   filter_dc_notch16(ref, st->notch_radius, st->d, st->frame_size, st->notch_mem);
+   filter_dc_notch16((spx_int16_t*)ref, st->notch_radius, st->d, st->frame_size, st->notch_mem);
    /* Copy input data to buffer */
    for (i=0;i<st->frame_size;i++)
    {