[svn-commits] wdoekes: branch 13 r420657 - in /branches/13: ./ main/tcptls.c

[SVN commits to the Digium repositories]

Author: wdoekes
Date: Mon Aug 11 04:54:20 2014
New Revision: 420657

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=420657
Log:
tcptls: Avoid compiler warning on non-dev-mode.
........

Merged revisions 420654 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 420655 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 420656 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    branches/13/   (props changed)
    branches/13/main/tcptls.c

Propchange: branches/13/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: branches/13/main/tcptls.c
URL: http://svnview.digium.com/svn/asterisk/branches/13/main/tcptls.c?view=diff&rev=420657&r1=420656&r2=420657
==============================================================================
--- branches/13/main/tcptls.c (original)
+++ branches/13/main/tcptls.c Mon Aug 11 04:54:20 2014
@@ -434,7 +434,12 @@
  */
 static void tcptls_stream_dtor(void *cookie)
 {
+#ifdef AST_DEVMODE
+	/* Since the ast_assert below is the only one using stream,
+	 * and ast_assert is only available with AST_DEVMODE, we
+	 * put this in a conditional to avoid compiler warnings. */
 	struct ast_tcptls_stream *stream = cookie;
+#endif
 
 	ast_assert(stream->fd == -1);
 }