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: https://origsvn.digium.com/svn/asterisk/trunk@296430 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/include/asterisk.h b/include/asterisk.h
index 8019acc021b68dc432a4720c3cf3debafe552a1f..a3f51622b4861b4c5d86075274f8db57f3b865aa 100644 (file)
--- 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>