Revert -r411073. It didn't help and blew up the system.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@411087 65c4cc65-6c06-0410-ace0-fbb531ad65f3
changes/97/197/1
Richard Mudgett 11 years ago
parent 89e12de79d
commit c8ebf3e3c7

@ -311,7 +311,6 @@ int __ast_pthread_mutex_lock(const char *filename, int lineno, const char *func,
} }
#endif /* DEBUG_THREADS */ #endif /* DEBUG_THREADS */
ast_assert(res == 0);/*!< \todo BUGBUG Test to ensure that lock/unlock does not fail. */
return res; return res;
} }
@ -418,7 +417,6 @@ int __ast_pthread_mutex_unlock(const char *filename, int lineno, const char *fun
__ast_mutex_logger("%s line %d (%s): Error: mutex '%s' is uninitialized and unable to initialize.\n", __ast_mutex_logger("%s line %d (%s): Error: mutex '%s' is uninitialized and unable to initialize.\n",
filename, lineno, func, mutex_name); filename, lineno, func, mutex_name);
} }
ast_assert(res == 0);/*!< \todo BUGBUG Test to ensure that lock/unlock does not fail. */
return res; return res;
} }
#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */ #endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
@ -479,7 +477,6 @@ int __ast_pthread_mutex_unlock(const char *filename, int lineno, const char *fun
} }
#endif /* DEBUG_THREADS */ #endif /* DEBUG_THREADS */
ast_assert(res == 0);/*!< \todo BUGBUG Test to ensure that lock/unlock does not fail. */
return res; return res;
} }

@ -37,12 +37,6 @@ void ast_register_file_version(const char *file, const char *version) { }
void ast_unregister_file_version(const char *file) { } void ast_unregister_file_version(const char *file) { }
#endif #endif
void __ast_assert_failed(int condition, const char *condition_str, const char *file, int line, const char *function);
void __ast_assert_failed(int condition, const char *condition_str, const char *file, int line, const char *function)
{
/*! \todo BUGBUG Put here only to allow utils to compile in AST_DEVMODE */
}
struct ast_flags ast_compat = { 7 }; struct ast_flags ast_compat = { 7 };
/*** MODULEINFO /*** MODULEINFO

@ -80,12 +80,6 @@ char ast_config_AST_SYSTEM_NAME[20] = ""; */
int option_debug = 0; int option_debug = 0;
int option_verbose = 0; int option_verbose = 0;
void __ast_assert_failed(int condition, const char *condition_str, const char *file, int line, const char *function);
void __ast_assert_failed(int condition, const char *condition_str, const char *file, int line, const char *function)
{
/*! \todo BUGBUG Put here only to allow utils to compile in AST_DEVMODE */
}
void ast_register_file_version(const char *file, const char *version); void ast_register_file_version(const char *file, const char *version);
void ast_register_file_version(const char *file, const char *version) void ast_register_file_version(const char *file, const char *version)
{ {

Loading…
Cancel
Save