Merge in a few more changes. This time the include/ directory.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@136402 65c4cc65-6c06-0410-ace0-fbb531ad65f3

include/asterisk/callerid.h

@@ -255,14 +255,14 @@ static inline float callerid_getcarrier(float *cr, float *ci, int bit)
 } while(0)
 
 #define PUT_AUDIO_SAMPLE(y) do { \
-	int index = (short)(rint(8192.0 * (y))); \
+	int __sample_idx = (short)(rint(8192.0 * (y))); \
-	*(buf++) = AST_LIN2X(index); \
+	*(buf++) = AST_LIN2X(__sample_idx); \
 	bytes++; \
 } while(0)
 
 #define PUT_CLID_MARKMS do { \
-	int x; \
+	int __clid_x; \
-	for (x=0;x<8;x++) \
+	for (__clid_x=0;__clid_x<8;__clid_x++) \
 		PUT_AUDIO_SAMPLE(callerid_getcarrier(&cr, &ci, 1)); \
 } while(0)
 

include/asterisk/strings.h

@@ -428,13 +428,13 @@ int ast_str_make_space(struct ast_str **buf, size_t new_len),
 
 #define ast_str_alloca(init_len)			\
 	({						\
-		struct ast_str *buf;			\
+		struct ast_str *__ast_str_buf;			\
-		buf = alloca(sizeof(*buf) + init_len);	\
+		__ast_str_buf = alloca(sizeof(*__ast_str_buf) + init_len);	\
-		buf->len = init_len;			\
+		__ast_str_buf->len = init_len;			\
-		buf->used = 0;				\
+		__ast_str_buf->used = 0;				\
-		buf->ts = DS_ALLOCA;			\
+		__ast_str_buf->ts = DS_ALLOCA;			\
-		buf->str[0] = '\0';			\
+		__ast_str_buf->str[0] = '\0';			\
-		(buf);					\
+		(__ast_str_buf);					\
 	})
 
 /*!