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

[SVN commits to the Asterisk project]

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

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

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

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

........
r120908 | jpeeler | 2008-06-06 13:05:15 -0500 (Fri, 06 Jun 2008) | 1 line

only define thread storage variable if necessary for LOW_MEMORY
........

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

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=120910&r1=120909&r2=120910
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Fri Jun  6 13:13:31 2008
@@ -1586,11 +1586,13 @@
 /*! \brief A per-thread temporary pvt structure */
 AST_THREADSTORAGE_CUSTOM(ts_temp_pvt, temp_pvt_init, temp_pvt_cleanup);
 
+#ifdef LOW_MEMORY
 static void ts_ast_rtp_destroy(void *);
 
 AST_THREADSTORAGE_CUSTOM(ts_audio_rtp, NULL, ts_ast_rtp_destroy);
 AST_THREADSTORAGE_CUSTOM(ts_video_rtp, NULL, ts_ast_rtp_destroy);
 AST_THREADSTORAGE_CUSTOM(ts_text_rtp, NULL, ts_ast_rtp_destroy);
+#endif
 
 /*! \brief Authentication list for realm authentication 
  * \todo Move the sip_auth list to AST_LIST */