- cleanup of some openpbx defines

This commit is contained in:
MelwareDE 2006-04-01 21:01:41 +00:00
parent a1f9a32839
commit fdc7448269
2 changed files with 18 additions and 11 deletions

View File

@ -66,26 +66,20 @@ static inline unsigned int read_capi_dword(void *m)
/*
* define some private functions
*/
#ifdef PBX_IS_OPBX
#define cc_mutex_t opbx_mutex_t
#define cc_mutex_init opbx_mutex_init
#define cc_mutex_lock(x) opbx_mutex_lock(x)
#define cc_mutex_unlock(x) opbx_mutex_unlock(x)
#define cc_copy_string(dst, src, size) opbx_copy_string(dst, src, size)
#define cc_log(x...) opbx_log(x)
#define cc_pbx_verbose(x...) opbx_verbose(x)
#else
#define cc_mutex_t ast_mutex_t
#define cc_mutex_init ast_mutex_init
#define cc_mutex_lock(x) ast_mutex_lock(x)
#define cc_mutex_unlock(x) ast_mutex_unlock(x)
#define cc_log(x...) ast_log(x)
#define cc_pbx_verbose(x...) ast_verbose(x)
#ifdef PBX_IS_OPBX
#define cc_copy_string(dst, src, size) opbx_copy_string(dst, src, size)
#else
#ifdef CC_AST_NO_STRINGS
#define cc_copy_string(dst, src, size) strncpy(dst, src, size -1)
#else
#define cc_copy_string(dst, src, size) ast_copy_string(dst, src, size)
#endif
#define cc_log(x...) ast_log(x)
#define cc_pbx_verbose(x...) ast_verbose(x)
#endif
/*

View File

@ -92,6 +92,19 @@
#define ast_best_codec opbx_best_codec
#define ast_update_use_count opbx_update_use_count
#define ast_codec_pref opbx_codec_pref
#define ast_mutex_t opbx_mutex_t
#define ast_mutex_init opbx_mutex_init
#define ast_mutex_lock opbx_mutex_lock
#define ast_mutex_unlock opbx_mutex_unlock
#define ast_cond_t opbx_cond_t
#define ast_cond_init opbx_cond_init
#define ast_cond_destroy opbx_cond_destroy
#define ast_cond_signal opbx_cond_signal
#define ast_cond_broadcast opbx_cond_broadcast
#define ast_cond_wait opbx_cond_wait
#define ast_cond_timedwait opbx_cond_timedwait
#define ast_log opbx_log
#define ast_verbose opbx_verbose
#define AST_FORMAT_ALAW OPBX_FORMAT_ALAW
#define AST_FORMAT_ULAW OPBX_FORMAT_ULAW