diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-27 15:00:48 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-27 15:00:48 +0000 |
| commit | 3be602e6c84bd15d5399be3352435b49e1329500 (patch) | |
| tree | 8d6a23c06dea5cc67f34f27623fb8dd2514f02c5 /include/asterisk.h | |
| parent | 4af2c0074afcb295979d5d857477db3272b9c99c (diff) | |
improve header inclusion process in a few small ways:
- it is no longer necessary to forcibly include asterisk/autoconfig.h; every module already includes asterisk.h as its first header (even before system headers), which serves the same purpose
- astmm.h is now included by asterisk.h when needed, instead of being forced by the Makefile; this means external modules will build properly against installed headers with MALLOC_DEBUG enabled
- simplify the usage of some of these headers in the AEL-related stuff in the utils directory
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@144924 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk.h')
| -rw-r--r-- | include/asterisk.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/include/asterisk.h b/include/asterisk.h index 4fcb5f8ed..e5202bb58 100644 --- a/include/asterisk.h +++ b/include/asterisk.h @@ -18,15 +18,12 @@ #ifndef _ASTERISK_H #define _ASTERISK_H -/* The include of 'autoconfig.h' is not necessary for any modules that - are part of the Asterisk source tree, because the top-level Makefile - will forcibly include that header in all compilations before all - other headers (even system headers). However, leaving this here will - help out-of-tree module builders, and doesn't cause any harm for the - in-tree modules. -*/ #include "asterisk/autoconfig.h" +#if !defined(STANDALONE_AEL) && defined(MALLOC_DEBUG) +#include "asterisk/astmm.h" +#endif + #include "asterisk/compat.h" #include "asterisk/paths.h" |