diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-02 00:25:16 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-02 00:25:16 +0000 |
commit | 847b7a6236a517d52f4dbc673ef5adce6723eb36 (patch) | |
tree | 95d74d9cf050fbc9d2aeb9a473f27065fe72f0b3 /include/asterisk | |
parent | 0b308eadda9bab5ec24952f15405cd60b3b9b62b (diff) |
Ensure that Asterisk builds with --enable-dev-mode, even on the latest gcc
and glibc.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@160207 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk')
-rw-r--r-- | include/asterisk/stringfields.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asterisk/stringfields.h b/include/asterisk/stringfields.h index 97e65532d..ac9481156 100644 --- a/include/asterisk/stringfields.h +++ b/include/asterisk/stringfields.h @@ -242,8 +242,10 @@ void __ast_string_field_index_build_va(struct ast_string_field_mgr *mgr, if ((__zz__[0] != 0) && (__dlen__ <= (strlen(__zz__) + 1))) { \ memcpy(__zz__, data, __dlen__); \ } else { \ - if (((x)->__begin_field[index] = __ast_string_field_alloc_space(&(x)->__field_mgr, __dlen__, &(x)->__begin_field[0], ast_string_field_count(x)))) \ - memcpy((char*) (x)->__begin_field[index], data, __dlen__); \ + if (((x)->__begin_field[index] = __ast_string_field_alloc_space(&(x)->__field_mgr, __dlen__, &(x)->__begin_field[0], ast_string_field_count(x)))) { \ + char *__yy__ = (char *) (x)->__begin_field[index]; \ + memcpy(__yy__, data, __dlen__); \ + } \ } \ } \ } while (0) |