diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-04 18:19:55 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-04 18:19:55 +0000 |
commit | f409b5bba7f5dd37304c07d276173995b755729c (patch) | |
tree | ebbb827c5e0e7f2873b53158deb5706275f5eeba /channels | |
parent | d8c8b23c1a8dc24b755e69920fee884a59f4389f (diff) |
Merged revisions 49457,49460-49461 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49457 | kpfleming | 2007-01-04 12:05:47 -0600 (Thu, 04 Jan 2007) | 2 lines
make building of codec_gsm against the system GSM library actually work
........
r49460 | kpfleming | 2007-01-04 12:16:40 -0600 (Thu, 04 Jan 2007) | 2 lines
don't define this type either if LOW_MEMORY is enabled
........
r49461 | kpfleming | 2007-01-04 12:17:01 -0600 (Thu, 04 Jan 2007) | 2 lines
don't do frame header caching in the core if LOW_MEMORY is defined
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@49463 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r-- | channels/iax2-parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/iax2-parser.c b/channels/iax2-parser.c index a4a81e20c..14cac4836 100644 --- a/channels/iax2-parser.c +++ b/channels/iax2-parser.c @@ -55,11 +55,11 @@ static void frame_cache_cleanup(void *data); /*! \brief A per-thread cache of iax_frame structures */ AST_THREADSTORAGE_CUSTOM(frame_cache, NULL, frame_cache_cleanup); -#endif /*! \brief This is just so iax_frames, a list head struct for holding a list of * iax_frame structures, is defined. */ AST_LIST_HEAD_NOLOCK(iax_frames, iax_frame); +#endif static void internaloutput(const char *str) { |