[svn-commits] file: branch 12 r423208 - in /branches/12: ./ res/res_rtp_asterisk.c

[SVN commits to the Digium repositories]

Author: file
Date: Tue Sep 16 15:31:31 2014
New Revision: 423208

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=423208
Log:
res_rtp_asterisk: Fix building when pjproject is not used.
........

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

Modified:
    branches/12/   (props changed)
    branches/12/res/res_rtp_asterisk.c

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

Modified: branches/12/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/res/res_rtp_asterisk.c?view=diff&rev=423208&r1=423207&r2=423208
==============================================================================
--- branches/12/res/res_rtp_asterisk.c (original)
+++ branches/12/res/res_rtp_asterisk.c Tue Sep 16 15:31:31 2014
@@ -2465,8 +2465,10 @@
 static int ast_rtp_destroy(struct ast_rtp_instance *instance)
 {
 	struct ast_rtp *rtp = ast_rtp_instance_get_data(instance);
+#ifdef HAVE_PJPROJECT
 	struct timeval wait = ast_tvadd(ast_tvnow(), ast_samp2tv(TURN_STATE_WAIT_TIME, 1000));
 	struct timespec ts = { .tv_sec = wait.tv_sec, .tv_nsec = wait.tv_usec * 1000, };
+#endif
 
 	/* Destroy the smoother that was smoothing out audio if present */
 	if (rtp->smoother) {