Ignore:
Timestamp:
2011-12-07T23:44:34+01:00 (4 years ago)
Author:
jow
Message:

[packages_10.03.1] merge asterisk-1.8.x updates

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/packages_10.03.1/net/asterisk-1.8.x/patches/300-word_alignment_arm.patch

    r25560 r29476  
    11--- a/main/utils.c 
    22+++ b/main/utils.c 
    3 @@ -1632,7 +1632,7 @@ ast_string_field __ast_string_field_allo 
     3@@ -1666,7 +1666,7 @@ ast_string_field __ast_string_field_allo 
    44        } 
    55  
    66        result = (*pool_head)->base + (*pool_head)->used; 
    77-#ifdef __sparc__ 
    8 +#if defined(__sparc__) || defined(__mips__) || defined(__arm__) 
     8+#if defined(__sparc__) || defined(__arm__) 
    99        /* SPARC requires that the allocation field be aligned. */ 
    1010        if ((long) result % sizeof(ast_string_field_allocation)) { 
    1111                result++; 
    12 @@ -1713,7 +1713,7 @@ void __ast_string_field_ptr_build_va(str 
     12@@ -1747,7 +1747,7 @@ void __ast_string_field_ptr_build_va(str 
    1313                } 
    1414        } else { 
    1515                target = (*pool_head)->base + (*pool_head)->used + sizeof(ast_string_field_allocation); 
    1616-#ifdef __sparc__ 
    17 +#if defined(__sparc__) || defined(__mips__) || defined(__arm__) 
     17+#if defined(__sparc__) || defined(__arm__) 
    1818                if ((long) target % sizeof(ast_string_field_allocation)) { 
    1919                        target++; 
Note: See TracChangeset for help on using the changeset viewer.