diff options
| author | Mark Michelson <mmichelson@digium.com> | 2008-04-23 00:58:49 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2008-04-23 00:58:49 +0000 |
| commit | 797adf6bf8ead9bad8c5a4ece744feefeb171c49 (patch) | |
| tree | 374e740fb7c21101de7e9ff68b434d794aaac4a9 /include/asterisk/astobj.h | |
| parent | edf03132155f3233cd8fd6a7a0b3febe5faf905f (diff) | |
Round 2 of IMAP_STORAGE app_voicemail.c fixes:
This fixes a bug that was thought to be fixed already.
app_voicemail, if using IMAP_STORAGE, has a problem because
the IMAP header files include syslog.h, which define LOG_WARNING
and LOG_DEBUG to be different than what Asterisk uses for those
same macros. This was "fixed" in the past by including all the
IMAP header files prior to including asterisk.h. This fix worked...
unless you were to try to compile with MALLOC_DEBUG. MALLOC_DEBUG
prepends the inclusion of astmm.h to every file, which means that no
matter what order the includes are in in app_voicemail, the unexpected
values for LOG_WARNING and LOG_DEBUG will be in place.
The action taken for this fix was to define AST_LOG_* macros in addition
to the LOG_* macros already defined. These new macros are used in app_voicemail.c,
logger.h, and astobj.h right now, and their use will be encouraged in the future.
In consideration of those who have written third-party modules which use
the LOG_* macros, these will NOT be removed from the source, however future use
of these macros is discouraged.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114577 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/astobj.h')
| -rw-r--r-- | include/asterisk/astobj.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asterisk/astobj.h b/include/asterisk/astobj.h index 1d302d38a..dfdb55b64 100644 --- a/include/asterisk/astobj.h +++ b/include/asterisk/astobj.h @@ -220,7 +220,7 @@ extern "C" { if (__builtin_expect((object)->refcount > 0, 1)) \ newcount = --((object)->refcount); \ else \ - ast_log(LOG_WARNING, "Unreferencing unreferenced (object)!\n"); \ + ast_log(AST_LOG_WARNING, "Unreferencing unreferenced (object)!\n"); \ ASTOBJ_UNLOCK(object); \ if (newcount == 0) { \ ast_mutex_destroy(&(object)->_lock); \ |