[asterisk-commits] jpeeler: branch 1.6.0 r120961 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Fri Jun  6 13:31:31 2008
New Revision: 120961

URL: http://svn.digium.com/view/asterisk?view=rev&rev=120961
Log:
Merged revisions 120960 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r120960 | jpeeler | 2008-06-06 13:30:17 -0500 (Fri, 06 Jun 2008) | 9 lines

Merged revisions 120959 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r120959 | jpeeler | 2008-06-06 13:29:14 -0500 (Fri, 06 Jun 2008) | 1 line

add another LOW_MEMORY define I forgot
........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=120961&r1=120960&r2=120961
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Fri Jun  6 13:31:31 2008
@@ -7011,11 +7011,13 @@
 	return 0;
 }
 
+#ifdef LOW_MEMORY
 static void ts_ast_rtp_destroy(void *data)
 {
     struct ast_rtp *tmp = data;
     ast_rtp_destroy(tmp);
 }
+#endif
 
 /*! \brief Add header to SIP message */
 static int add_header(struct sip_request *req, const char *var, const char *value)