diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-11-27 10:00:35 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-11-27 10:00:35 +0000 |
| commit | faf6a479bfbbfa21fd53b4c9301c24ea8b5910b3 (patch) | |
| tree | 61a083c315af158fa22019648655dc1d06c2c532 /include/asterisk.h | |
| parent | 9cbeb6626c21b903642a64dadc51cfce7d66f1f3 (diff) | |
Merged revisions 296429 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r296429 | tilghman | 2010-11-27 03:58:57 -0600 (Sat, 27 Nov 2010) | 5 lines
Also don't build DEBUG_FD_LEAKS when STANDALONE2 is defined.
(closes issue #18385)
Reported by: cmaj
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@296430 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk.h')
| -rw-r--r-- | include/asterisk.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asterisk.h b/include/asterisk.h index 8019acc02..a3f51622b 100644 --- a/include/asterisk.h +++ b/include/asterisk.h @@ -20,7 +20,7 @@ #include "asterisk/autoconfig.h" -#if !defined(NO_MALLOC_DEBUG) && !defined(STANDALONE) && defined(MALLOC_DEBUG) +#if !defined(NO_MALLOC_DEBUG) && !defined(STANDALONE) && !defined(STANDALONE2) && defined(MALLOC_DEBUG) #include "asterisk/astmm.h" #endif @@ -43,7 +43,7 @@ #define setpriority __PLEASE_USE_ast_set_priority_INSTEAD_OF_setpriority__ #define sched_setscheduler __PLEASE_USE_ast_set_priority_INSTEAD_OF_sched_setscheduler__ -#if defined(DEBUG_FD_LEAKS) && !defined(STANDALONE) && !defined(STANDALONE_AEL) +#if defined(DEBUG_FD_LEAKS) && !defined(STANDALONE) && !defined(STANDALONE2) && !defined(STANDALONE_AEL) /* These includes are all about ordering */ #include <stdio.h> #include <sys/types.h> |