[svn-commits] seanbright: trunk r136402 - in /trunk/include/asterisk: callerid.h strings.h

[SVN commits to the Digium repositories]

Author: seanbright
Date: Thu Aug  7 09:36:59 2008
New Revision: 136402

URL: http://svn.digium.com/view/asterisk?view=rev&rev=136402
Log:
Merge in a few more changes.  This time the include/ directory.

Modified:
    trunk/include/asterisk/callerid.h
    trunk/include/asterisk/strings.h

Modified: trunk/include/asterisk/callerid.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/callerid.h?view=diff&rev=136402&r1=136401&r2=136402
==============================================================================
--- trunk/include/asterisk/callerid.h (original)
+++ trunk/include/asterisk/callerid.h Thu Aug  7 09:36:59 2008
@@ -255,14 +255,14 @@
 } while(0)
 
 #define PUT_AUDIO_SAMPLE(y) do { \
-	int index = (short)(rint(8192.0 * (y))); \
-	*(buf++) = AST_LIN2X(index); \
+	int __sample_idx = (short)(rint(8192.0 * (y))); \
+	*(buf++) = AST_LIN2X(__sample_idx); \
 	bytes++; \
 } while(0)
 
 #define PUT_CLID_MARKMS do { \
-	int x; \
-	for (x=0;x<8;x++) \
+	int __clid_x; \
+	for (__clid_x=0;__clid_x<8;__clid_x++) \
 		PUT_AUDIO_SAMPLE(callerid_getcarrier(&cr, &ci, 1)); \
 } while(0)
 

Modified: trunk/include/asterisk/strings.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/strings.h?view=diff&rev=136402&r1=136401&r2=136402
==============================================================================
--- trunk/include/asterisk/strings.h (original)
+++ trunk/include/asterisk/strings.h Thu Aug  7 09:36:59 2008
@@ -428,13 +428,13 @@
 
 #define ast_str_alloca(init_len)			\
 	({						\
-		struct ast_str *buf;			\
-		buf = alloca(sizeof(*buf) + init_len);	\
-		buf->len = init_len;			\
-		buf->used = 0;				\
-		buf->ts = DS_ALLOCA;			\
-		buf->str[0] = '\0';			\
-		(buf);					\
+		struct ast_str *__ast_str_buf;			\
+		__ast_str_buf = alloca(sizeof(*__ast_str_buf) + init_len);	\
+		__ast_str_buf->len = init_len;			\
+		__ast_str_buf->used = 0;				\
+		__ast_str_buf->ts = DS_ALLOCA;			\
+		__ast_str_buf->str[0] = '\0';			\
+		(__ast_str_buf);					\
 	})
 
 /*!