[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

diff --git a/net/asterisk-1.8.x/patches/300-word_alignment_arm.patch b/net/asterisk-1.8.x/patches/300-word_alignment_arm.patch
index 12d5551c1d9066661b8fca7d4c87d410c5aa5dfa..cc638b3f78c4c33ca7ccc9a4eef687d7a225283a 100644 (file)
--- a/net/asterisk-1.8.x/patches/300-word_alignment_arm.patch
+++ b/net/asterisk-1.8.x/patches/300-word_alignment_arm.patch
@@ -1,20 +1,20 @@
 --- a/main/utils.c
 +++ b/main/utils.c
-@@ -1632,7 +1632,7 @@ ast_string_field __ast_string_field_allo
+@@ -1666,7 +1666,7 @@ ast_string_field __ast_string_field_allo
        }
  
        result = (*pool_head)->base + (*pool_head)->used;
 -#ifdef __sparc__
-+#if defined(__sparc__) || defined(__mips__) || defined(__arm__)
++#if defined(__sparc__) || defined(__arm__)
        /* SPARC requires that the allocation field be aligned. */
        if ((long) result % sizeof(ast_string_field_allocation)) {
                result++;
-@@ -1713,7 +1713,7 @@ void __ast_string_field_ptr_build_va(str
+@@ -1747,7 +1747,7 @@ void __ast_string_field_ptr_build_va(str
                }
        } else {
                target = (*pool_head)->base + (*pool_head)->used + sizeof(ast_string_field_allocation);
 -#ifdef __sparc__
-+#if defined(__sparc__) || defined(__mips__) || defined(__arm__)
++#if defined(__sparc__) || defined(__arm__)
                if ((long) target % sizeof(ast_string_field_allocation)) {
                        target++;
                        space--;