From c5c17a14345c8004930f9e7175b7fc47624a8766 Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Thu, 4 Jan 2007 21:59:06 +0000
Subject: Merged revisions 49536 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r49536 | kpfleming | 2007-01-04 15:58:42 -0600 (Thu, 04 Jan 2007) | 2 lines

don't mark these allocations as 'cache' allocations when caching has been disabled

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49538 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 main/frame.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'main/frame.c')

diff --git a/main/frame.c b/main/frame.c
index f8935db5c..39ba8cdad 100644
--- a/main/frame.c
+++ b/main/frame.c
@@ -304,10 +304,12 @@ static struct ast_frame *ast_frame_header_new(void)
 			return f;
 		}
 	}
-#endif
-
 	if (!(f = ast_calloc_cache(1, sizeof(*f))))
 		return NULL;
+#else
+	if (!(f = ast_calloc(1, sizeof(*f))))
+		return NULL;
+#endif
 
 	f->mallocd_hdr_len = sizeof(*f);
 #ifdef TRACE_FRAMES
-- 
cgit v1.2.3