aboutsummaryrefslogtreecommitdiffstats
path: root/include/asterisk
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-09-27 16:49:27 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-09-27 16:49:27 +0000
commit91ba8ce8c94796fed8bc3f92733721eb66582a3b (patch)
tree08fd22336f059b6ad0ce0c54f8d251c011c217da /include/asterisk
parent3b0484f45b3b63714e8800d4ae48ac0f3b7baf4e (diff)
Merged revisions 144949-144951 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r144949 | kpfleming | 2008-09-27 10:52:56 -0500 (Sat, 27 Sep 2008) | 17 lines Merged revisions 144924-144925 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r144924 | kpfleming | 2008-09-27 10:00:48 -0500 (Sat, 27 Sep 2008) | 6 lines 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 ........ r144925 | kpfleming | 2008-09-27 10:13:30 -0500 (Sat, 27 Sep 2008) | 2 lines fix some minor issues with rev 144924 ........ ................ r144950 | kpfleming | 2008-09-27 11:10:33 -0500 (Sat, 27 Sep 2008) | 2 lines fix bugs caused by r144949 when MALLOC_DEBUG is defined ................ r144951 | kpfleming | 2008-09-27 11:17:43 -0500 (Sat, 27 Sep 2008) | 1 line remove incorrect comment ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@144993 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk')
-rw-r--r--include/asterisk/astmm.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/asterisk/astmm.h b/include/asterisk/astmm.h
index f2a632e3c..5d0d47ff5 100644
--- a/include/asterisk/astmm.h
+++ b/include/asterisk/astmm.h
@@ -27,6 +27,13 @@
#include "asterisk.h"
+/* Include these now to prevent them from being needed later */
+#include <sys/types.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+
/* Undefine any macros */
#undef malloc
#undef calloc