[asterisk-commits] tilghman: trunk r296430 - in /trunk: ./ include/asterisk.h

[SVN commits to the Asterisk project]

Author: tilghman
Date: Sat Nov 27 04:00:35 2010
New Revision: 296430

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=296430
Log:
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
........

Modified:
    trunk/   (props changed)
    trunk/include/asterisk.h

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/include/asterisk.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk.h?view=diff&rev=296430&r1=296429&r2=296430
==============================================================================
--- trunk/include/asterisk.h (original)
+++ trunk/include/asterisk.h Sat Nov 27 04:00:35 2010
@@ -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>