+#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_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)
#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 */
#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)