More merges from resolve-shadow warnings:

  utils/
  codecs/
  and a change I missed from formats/


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@136408 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 34 insertions, 34 deletions

diff --git a/formats/msgsm.h b/formats/msgsm.h
index a0cc2bcff..ba7738f1d 100644
--- a/formats/msgsm.h
+++ b/formats/msgsm.h
@@ -349,105 +349,105 @@ static inline void conv66(gsm_byte * d, wav_byte * c) {
 }
 
 #define writeGSM_33(c1) { \
-				gsm_byte *c = (c1); \
-                *c++ =   ((GSM_MAGIC & 0xF) << 4)               /* 1 */ \
+				gsm_byte *__c = (c1); \
+                *__c++ =   ((GSM_MAGIC & 0xF) << 4)               /* 1 */ \
                            | ((LARc[0] >> 2) & 0xF); \
-                *c++ =   ((LARc[0] & 0x3) << 6) \
+                *__c++ =   ((LARc[0] & 0x3) << 6) \
                            | (LARc[1] & 0x3F); \
-                *c++ =   ((LARc[2] & 0x1F) << 3) \
+                *__c++ =   ((LARc[2] & 0x1F) << 3) \
                            | ((LARc[3] >> 2) & 0x7); \
-                *c++ =   ((LARc[3] & 0x3) << 6) \
+                *__c++ =   ((LARc[3] & 0x3) << 6) \
                        | ((LARc[4] & 0xF) << 2) \
                        | ((LARc[5] >> 2) & 0x3); \
-                *c++ =   ((LARc[5] & 0x3) << 6) \
+                *__c++ =   ((LARc[5] & 0x3) << 6) \
                        | ((LARc[6] & 0x7) << 3) \
                        | (LARc[7] & 0x7);   \
-                *c++ =   ((Nc[0] & 0x7F) << 1) \
+                *__c++ =   ((Nc[0] & 0x7F) << 1) \
                        | ((bc[0] >> 1) & 0x1); \
-                *c++ =   ((bc[0] & 0x1) << 7) \
+                *__c++ =   ((bc[0] & 0x1) << 7) \
                        | ((Mc[0] & 0x3) << 5) \
                        | ((xmaxc[0] >> 1) & 0x1F); \
-                *c++ =   ((xmaxc[0] & 0x1) << 7) \
+                *__c++ =   ((xmaxc[0] & 0x1) << 7) \
                        | ((xmc[0] & 0x7) << 4) \
                        | ((xmc[1] & 0x7) << 1) \
                            | ((xmc[2] >> 2) & 0x1); \
-                *c++ =   ((xmc[2] & 0x3) << 6) \
+                *__c++ =   ((xmc[2] & 0x3) << 6) \
                        | ((xmc[3] & 0x7) << 3) \
                        | (xmc[4] & 0x7); \
-                *c++ =   ((xmc[5] & 0x7) << 5)                  /* 10 */ \
+                *__c++ =   ((xmc[5] & 0x7) << 5)                  /* 10 */ \
                        | ((xmc[6] & 0x7) << 2) \
                        | ((xmc[7] >> 1) & 0x3); \
-                *c++ =   ((xmc[7] & 0x1) << 7) \
+                *__c++ =   ((xmc[7] & 0x1) << 7) \
                        | ((xmc[8] & 0x7) << 4) \
                        | ((xmc[9] & 0x7) << 1) \
                        | ((xmc[10] >> 2) & 0x1); \
-                *c++ =   ((xmc[10] & 0x3) << 6) \
+                *__c++ =   ((xmc[10] & 0x3) << 6) \
                        | ((xmc[11] & 0x7) << 3) \
                        | (xmc[12] & 0x7); \
-                *c++ =   ((Nc[1] & 0x7F) << 1) \
+                *__c++ =   ((Nc[1] & 0x7F) << 1) \
                        | ((bc[1] >> 1) & 0x1); \
-                *c++ =   ((bc[1] & 0x1) << 7) \
+                *__c++ =   ((bc[1] & 0x1) << 7) \
                        | ((Mc[1] & 0x3) << 5) \
                        | ((xmaxc[1] >> 1) & 0x1F);  \
-                *c++ =   ((xmaxc[1] & 0x1) << 7) \
+                *__c++ =   ((xmaxc[1] & 0x1) << 7) \
                        | ((xmc[13] & 0x7) << 4) \
                            | ((xmc[14] & 0x7) << 1) \
                        | ((xmc[15] >> 2) & 0x1); \
-                *c++ =   ((xmc[15] & 0x3) << 6) \
+                *__c++ =   ((xmc[15] & 0x3) << 6) \
                        | ((xmc[16] & 0x7) << 3) \
                        | (xmc[17] & 0x7); \
-                *c++ =   ((xmc[18] & 0x7) << 5) \
+                *__c++ =   ((xmc[18] & 0x7) << 5) \
                        | ((xmc[19] & 0x7) << 2) \
                        | ((xmc[20] >> 1) & 0x3); \
-                *c++ =   ((xmc[20] & 0x1) << 7) \
+                *__c++ =   ((xmc[20] & 0x1) << 7) \
                        | ((xmc[21] & 0x7) << 4) \
                        | ((xmc[22] & 0x7) << 1) \
                            | ((xmc[23] >> 2) & 0x1); \
-                *c++ =   ((xmc[23] & 0x3) << 6) \
+                *__c++ =   ((xmc[23] & 0x3) << 6) \
                        | ((xmc[24] & 0x7) << 3) \
                            | (xmc[25] & 0x7); \
-                *c++ =   ((Nc[2] & 0x7F) << 1)                  /* 20 */ \
+                *__c++ =   ((Nc[2] & 0x7F) << 1)                  /* 20 */ \
                        | ((bc[2] >> 1) & 0x1); \
-                *c++ =   ((bc[2] & 0x1) << 7) \
+                *__c++ =   ((bc[2] & 0x1) << 7) \
                        | ((Mc[2] & 0x3) << 5) \
                        | ((xmaxc[2] >> 1) & 0x1F); \
-                *c++ =   ((xmaxc[2] & 0x1) << 7)   \
+                *__c++ =   ((xmaxc[2] & 0x1) << 7)   \
                        | ((xmc[26] & 0x7) << 4) \
                        | ((xmc[27] & 0x7) << 1) \
                        | ((xmc[28] >> 2) & 0x1); \
-                *c++ =   ((xmc[28] & 0x3) << 6) \
+                *__c++ =   ((xmc[28] & 0x3) << 6) \
                        | ((xmc[29] & 0x7) << 3) \
                        | (xmc[30] & 0x7); \
-                *c++ =   ((xmc[31] & 0x7) << 5) \
+                *__c++ =   ((xmc[31] & 0x7) << 5) \
                        | ((xmc[32] & 0x7) << 2) \
                        | ((xmc[33] >> 1) & 0x3); \
-                *c++ =   ((xmc[33] & 0x1) << 7) \
+                *__c++ =   ((xmc[33] & 0x1) << 7) \
                        | ((xmc[34] & 0x7) << 4) \
                        | ((xmc[35] & 0x7) << 1) \
                        | ((xmc[36] >> 2) & 0x1); \
-                *c++ =   ((xmc[36] & 0x3) << 6) \
+                *__c++ =   ((xmc[36] & 0x3) << 6) \
                            | ((xmc[37] & 0x7) << 3) \
                        | (xmc[38] & 0x7); \
-                *c++ =   ((Nc[3] & 0x7F) << 1) \
+                *__c++ =   ((Nc[3] & 0x7F) << 1) \
                        | ((bc[3] >> 1) & 0x1); \
-                *c++ =   ((bc[3] & 0x1) << 7)  \
+                *__c++ =   ((bc[3] & 0x1) << 7)  \
                        | ((Mc[3] & 0x3) << 5) \
                        | ((xmaxc[3] >> 1) & 0x1F); \
-                *c++ =   ((xmaxc[3] & 0x1) << 7) \
+                *__c++ =   ((xmaxc[3] & 0x1) << 7) \
                        | ((xmc[39] & 0x7) << 4) \
                        | ((xmc[40] & 0x7) << 1) \
                        | ((xmc[41] >> 2) & 0x1); \
-                *c++ =   ((xmc[41] & 0x3) << 6)                 /* 30 */ \
+                *__c++ =   ((xmc[41] & 0x3) << 6)                 /* 30 */ \
                        | ((xmc[42] & 0x7) << 3) \
                        | (xmc[43] & 0x7); \
-                *c++ =   ((xmc[44] & 0x7) << 5) \
+                *__c++ =   ((xmc[44] & 0x7) << 5) \
                        | ((xmc[45] & 0x7) << 2) \
                        | ((xmc[46] >> 1) & 0x3); \
-                *c++ =   ((xmc[46] & 0x1) << 7) \
+                *__c++ =   ((xmc[46] & 0x1) << 7) \
                        | ((xmc[47] & 0x7) << 4) \
                        | ((xmc[48] & 0x7) << 1) \
                        | ((xmc[49] >> 2) & 0x1); \
-                *c++ =   ((xmc[49] & 0x3) << 6) \
+                *__c++ =   ((xmc[49] & 0x3) << 6) \
                        | ((xmc[50] & 0x7) << 3) \
                            | (xmc[51] & 0x7); \
 }