kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 16:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@136402 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2008-08-07 14:36:59 +00:00
parent 4d0a4e7bfa
commit 4fb07fb0c1
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/asterisk/callerid.h
View File

@@ -255,14 +255,14 @@ static inline float callerid_getcarrier(float *cr, float *ci, int bit)
} while(0) } while(0)
#define PUT_AUDIO_SAMPLE(y) do { \ #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++; \ bytes++; \
} while(0) } while(0)
#define PUT_CLID_MARKMS do { \ #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)); \ PUT_AUDIO_SAMPLE(callerid_getcarrier(&cr, &ci, 1)); \
} while(0) } while(0)

14
include/asterisk/strings.h
View File

@@ -428,13 +428,13 @@ int ast_str_make_space(struct ast_str **buf, size_t new_len),
#define ast_str_alloca(init_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); \
}) })
/*! /*!