Changeset 5170 for pjproject/trunk/pjmedia/src/pjmedia/tonegen.c

Timestamp:

Aug 25, 2015 8:45:46 AM (9 years ago)

Author:

nanang

Message:

Re #1881: Fixed compile warnings on VS2015 about declaration hides previous declaration.

File:

• pjproject/trunk/pjmedia/src/pjmedia/tonegen.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia/tonegen.c

@@ -666 +666 @@
                 /* Fade in */
                 short *samp = (dst - cnt);
-                short *end;
+                short *samp_end;
 
                 if (cnt > tonegen->fade_in_len)
                     cnt = tonegen->fade_in_len;
-                end = samp + cnt;
+                samp_end = samp + cnt;
                 if (cnt) {
                     const unsigned step = 0xFFFF / cnt;
                     unsigned scale = 0;
 
-                    for (; samp < end; ++samp) {
+                    for (; samp < samp_end; ++samp) {
                         (*samp) = (short)(((*samp) * scale) >> 16);
                         scale += step;