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

1 files changed, 7 insertions, 7 deletions

diff --git a/include/asterisk/strings.h b/include/asterisk/strings.h
index 13d68d3fc..514b3af6a 100644
--- a/include/asterisk/strings.h
+++ b/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;			\
-		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);					\
 	})
 
 /*!