[asterisk-commits] tilghman: branch 1.6.1 r165329 - in /branches/1.6.1: ./ apps/app_macro.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Dec 17 15:31:15 2008
New Revision: 165329

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

........
  r165325 | tilghman | 2008-12-17 15:28:51 -0600 (Wed, 17 Dec 2008) | 2 lines
  
  Oops, broke trunk
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_macro.c

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

Modified: branches/1.6.1/apps/app_macro.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/apps/app_macro.c?view=diff&rev=165329&r1=165328&r2=165329
==============================================================================
--- branches/1.6.1/apps/app_macro.c (original)
+++ branches/1.6.1/apps/app_macro.c Wed Dec 17 15:31:15 2008
@@ -193,7 +193,7 @@
 		if (macro_store) {
 			break;
 		}
-		if (!(macro_store = ast_channel_datastore_alloc(&macro_ds_info, NULL))) {
+		if (!(macro_store = ast_datastore_alloc(&macro_ds_info, NULL))) {
 			ast_log(LOG_WARNING, "Unable to allocate new datastore.\n");
 			break;
 		}