Merge pull request #437 from micmac1/19-ast13-AST-2019-002-and-003

[feed/telephony.git] / net / asterisk-13.x / patches / 004-ifdef-missing-execinfo.patch

diff --git a/net/asterisk-13.x/patches/004-ifdef-missing-execinfo.patch b/net/asterisk-13.x/patches/004-ifdef-missing-execinfo.patch
index 264eb41a7b406c380c19cb76b28b39b2491c9406..1bcfee28fa126f7a5dca696c75952fee869369c7 100644 (file)
--- a/net/asterisk-13.x/patches/004-ifdef-missing-execinfo.patch
+++ b/net/asterisk-13.x/patches/004-ifdef-missing-execinfo.patch
@@ -26,12 +26,12 @@
 +#define AST_LOCK_TRACK_INIT_VALUE { { NULL }, { 0 }, 0, { NULL }, { 0 }, PTHREAD_MUTEX_INIT_VALUE }
 +#endif
  
- #define AST_MUTEX_INIT_VALUE { PTHREAD_MUTEX_INIT_VALUE, NULL, 1 }
- #define AST_MUTEX_INIT_VALUE_NOTRACKING { PTHREAD_MUTEX_INIT_VALUE, NULL, 0 }
+ #define AST_MUTEX_INIT_VALUE { PTHREAD_MUTEX_INIT_VALUE, NULL, {1, 0} }
+ #define AST_MUTEX_INIT_VALUE_NOTRACKING { PTHREAD_MUTEX_INIT_VALUE, NULL, {0, 0} }
 @@ -114,9 +120,11 @@ struct ast_lock_track {
        int reentrancy;
        const char *func[AST_MAX_REENTRANCY];
-       pthread_t thread[AST_MAX_REENTRANCY];
+       pthread_t thread_id[AST_MAX_REENTRANCY];
 +#ifndef __UCLIBC__
  #ifdef HAVE_BKTR
        struct ast_bt backtrace[AST_MAX_REENTRANCY];
@@ -40,7 +40,7 @@
        pthread_mutex_t reentr_mutex;
  };
  
-@@ -241,6 +249,7 @@ enum ast_lock_type {
+@@ -264,6 +272,7 @@ enum ast_lock_type {
   * on the lock.  ast_mark_lock_acquired() will mark it as held by this thread.
   */
  #if !defined(LOW_MEMORY)
@@ -48,7 +48,7 @@
  #ifdef HAVE_BKTR
  void ast_store_lock_info(enum ast_lock_type type, const char *filename,
        int line_num, const char *func, const char *lock_name, void *lock_addr, struct ast_bt *bt);
-@@ -248,14 +257,22 @@ void ast_store_lock_info(enum ast_lock_t
+@@ -271,14 +280,22 @@ void ast_store_lock_info(enum ast_lock_t
  void ast_store_lock_info(enum ast_lock_type type, const char *filename,
        int line_num, const char *func, const char *lock_name, void *lock_addr);
  #endif /* HAVE_BKTR */
@@ -71,7 +71,7 @@
  #endif /* !defined(LOW_MEMORY) */
  
  /*!
-@@ -283,19 +300,27 @@ void ast_mark_lock_failed(void *lock_add
+@@ -306,19 +323,27 @@ void ast_mark_lock_failed(void *lock_add
   * be removed from the current thread's lock info struct.
   */
  #if !defined(LOW_MEMORY)