diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-10-31 10:48:26 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-10-31 10:50:31 +0200 |
| commit | 538699c853816755c66c15f39f5d783005e1480a (patch) | |
| tree | d9d076b8e15b1dd592b7f048fc1a5a7dcff34281 /main/asterisk/musl-includes.patch | |
| parent | 1e50aa00c309d65fcaafd9f2491492cb3766780a (diff) | |
| download | aports-538699c853816755c66c15f39f5d783005e1480a.tar.bz2 aports-538699c853816755c66c15f39f5d783005e1480a.tar.xz | |
main/asterisk: upgrade to 13.0.0
Diffstat (limited to 'main/asterisk/musl-includes.patch')
| -rw-r--r-- | main/asterisk/musl-includes.patch | 64 |
1 files changed, 40 insertions, 24 deletions
diff --git a/main/asterisk/musl-includes.patch b/main/asterisk/musl-includes.patch index 810602607e..083e1b4233 100644 --- a/main/asterisk/musl-includes.patch +++ b/main/asterisk/musl-includes.patch @@ -1,25 +1,18 @@ ---- asterisk-11.7.0.orig/main/ast_expr2.c -+++ asterisk-11.7.0/main/ast_expr2.c -@@ -93,6 +93,7 @@ - - #include "asterisk.h" - -+#include <sys/cdefs.h> - #include <sys/types.h> - #include <stdio.h> - ---- asterisk-11.7.0.orig/main/ast_expr2.y -+++ asterisk-11.7.0/main/ast_expr2.y -@@ -14,6 +14,7 @@ - - #include "asterisk.h" - -+#include <sys/cdefs.h> - #include <sys/types.h> - #include <stdio.h> - ---- asterisk-12.1.0.orig/include/asterisk/compat.h -+++ asterisk-12.1.0/include/asterisk/compat.h +diff -ru asterisk-13.0.0.orig/channels/sip/include/route.h asterisk-13.0.0/channels/sip/include/route.h +--- asterisk-13.0.0.orig/channels/sip/include/route.h 2014-02-10 20:28:35.000000000 -0200 ++++ asterisk-13.0.0/channels/sip/include/route.h 2014-10-31 08:51:12.983809610 -0200 +@@ -98,7 +98,7 @@ + * \retval NULL on failure + */ + struct ast_str *sip_route_list(const struct sip_route *route, int formatcli, int skip) +- __attribute_malloc__ __attribute_warn_unused_result__; ++ __attribute__ ((malloc, warn_unused_result)); + + /*! + * \brief Check if the route is strict +diff -ru asterisk-13.0.0.orig/include/asterisk/compat.h asterisk-13.0.0/include/asterisk/compat.h +--- asterisk-13.0.0.orig/include/asterisk/compat.h 2014-10-31 08:48:56.000000000 -0200 ++++ asterisk-13.0.0/include/asterisk/compat.h 2014-10-31 08:49:10.163808393 -0200 @@ -68,7 +68,7 @@ #endif @@ -29,8 +22,9 @@ #else #include "asterisk/poll-compat.h" #endif ---- asterisk-12.1.0.orig/include/asterisk/poll-compat.h -+++ asterisk-12.1.0/include/asterisk/poll-compat.h +diff -ru asterisk-13.0.0.orig/include/asterisk/poll-compat.h asterisk-13.0.0/include/asterisk/poll-compat.h +--- asterisk-13.0.0.orig/include/asterisk/poll-compat.h 2014-10-31 08:48:56.000000000 -0200 ++++ asterisk-13.0.0/include/asterisk/poll-compat.h 2014-10-31 08:49:10.163808393 -0200 @@ -83,7 +83,7 @@ #ifndef AST_POLL_COMPAT @@ -40,3 +34,25 @@ #define ast_poll(a, b, c) poll(a, b, c) +diff -ru asterisk-13.0.0.orig/main/ast_expr2.c asterisk-13.0.0/main/ast_expr2.c +--- asterisk-13.0.0.orig/main/ast_expr2.c 2014-10-31 08:48:56.000000000 -0200 ++++ asterisk-13.0.0/main/ast_expr2.c 2014-10-31 08:49:10.163808393 -0200 +@@ -93,6 +93,7 @@ + + #include "asterisk.h" + ++#include <sys/cdefs.h> + #include <sys/types.h> + #include <stdio.h> + +diff -ru asterisk-13.0.0.orig/main/ast_expr2.y asterisk-13.0.0/main/ast_expr2.y +--- asterisk-13.0.0.orig/main/ast_expr2.y 2014-10-31 08:48:56.000000000 -0200 ++++ asterisk-13.0.0/main/ast_expr2.y 2014-10-31 08:49:10.163808393 -0200 +@@ -14,6 +14,7 @@ + + #include "asterisk.h" + ++#include <sys/cdefs.h> + #include <sys/types.h> + #include <stdio.h> + |