diff options
| author | Sean Bright <sean@malleable.com> | 2008-08-07 14:36:59 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2008-08-07 14:36:59 +0000 |
| commit | 4fb07fb0c19774348225c5662dbfb20f1a278693 (patch) | |
| tree | 419a796207c7f997204aeec3bb3a0107eb803cce | |
| parent | 4d0a4e7bfac6cb90ac6112a5f93a56ebaa719a7e (diff) | |
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
| -rw-r--r-- | include/asterisk/callerid.h | 8 | ||||
| -rw-r--r-- | include/asterisk/strings.h | 14 |
2 files changed, 11 insertions, 11 deletions
diff --git a/include/asterisk/callerid.h b/include/asterisk/callerid.h index 572351b34..45272e01a 100644 --- a/include/asterisk/callerid.h +++ b/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))); \ - *(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) 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); \ }) /*! |