Merged revisions 160207 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r160207 | tilghman | 2008-12-01 18:25:16 -0600 (Mon, 01 Dec 2008) | 3 lines
  
  Ensure that Asterisk builds with --enable-dev-mode, even on the latest gcc
  and glibc.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@160208 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-12-02 00:37:21 +00:00
parent 4dc60e7560
commit 3d4c0cd421
6 changed files with 29 additions and 10 deletions

View File

@@ -255,12 +255,16 @@ int __ast_string_field_init(struct ast_string_field_mgr *mgr,
const char *__d__ = (data); \
size_t __dlen__ = (__d__) ? strlen(__d__) + 1 : 1; \
const char **__p__ = (const char **) (ptr); \
char *__q__; \
if (__dlen__ == 1) \
*__p__ = __ast_string_field_empty; \
else if (!__ast_string_field_ptr_grow(&(x)->__field_mgr, __dlen__, ptr)) \
memcpy((char *) *__p__, __d__, __dlen__); \
else if ((*__p__ = __ast_string_field_alloc_space(&(x)->__field_mgr, &(x)->__field_mgr_pool, __dlen__))) \
memcpy((char *) *__p__, __d__, __dlen__); \
else if (!__ast_string_field_ptr_grow(&(x)->__field_mgr, __dlen__, ptr)) { \
__q__ = (char *) *__p__; \
memcpy(__q__, __d__, __dlen__); \
} else if ((*__p__ = __ast_string_field_alloc_space(&(x)->__field_mgr, &(x)->__field_mgr_pool, __dlen__))) { \
__q__ = (char *) *__p__; \
memcpy(__q__, __d__, __dlen__); \
} \
} while (0)
/*!