[packages_10.03.1] merge asterisk-1.8.x updates
[openwrt/svn-archive/archive.git] / net / asterisk-1.8.x / patches / 300-word_alignment_arm.patch
1 --- a/main/utils.c
2 +++ b/main/utils.c
3 @@ -1666,7 +1666,7 @@ ast_string_field __ast_string_field_allo
4 }
5
6 result = (*pool_head)->base + (*pool_head)->used;
7 -#ifdef __sparc__
8 +#if defined(__sparc__) || defined(__arm__)
9 /* SPARC requires that the allocation field be aligned. */
10 if ((long) result % sizeof(ast_string_field_allocation)) {
11 result++;
12 @@ -1747,7 +1747,7 @@ void __ast_string_field_ptr_build_va(str
13 }
14 } else {
15 target = (*pool_head)->base + (*pool_head)->used + sizeof(ast_string_field_allocation);
16 -#ifdef __sparc__
17 +#if defined(__sparc__) || defined(__arm__)
18 if ((long) target % sizeof(ast_string_field_allocation)) {
19 target++;
20 space--;