[svn-commits] wdoekes: trunk r420658 - in /trunk: ./ main/tcptls.c

[SVN commits to the Digium repositories]

Author: wdoekes
Date: Mon Aug 11 04:55:13 2014
New Revision: 420658

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

Merged revisions 420657 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/main/tcptls.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-13-merged (original)
+++ branch-13-merged Mon Aug 11 04:55:13 2014
@@ -1,1 +1,1 @@
-/branches/13:1-420494,420514,420534,420536,420538,420562,420577,420592,420609,420624,420639
+/branches/13:1-420494,420514,420534,420536,420538,420562,420577,420592,420609,420624,420639,420657

Modified: trunk/main/tcptls.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/tcptls.c?view=diff&rev=420658&r1=420657&r2=420658
==============================================================================
--- trunk/main/tcptls.c (original)
+++ trunk/main/tcptls.c Mon Aug 11 04:55:13 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);
 }