[asterisk-commits] russell: branch 1.6.0 r168204 - in /branches/1.6.0: ./ res/res_musiconhold.c

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Jan  9 16:22:29 2009
New Revision: 168204

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

................
r168200 | russell | 2009-01-09 16:21:05 -0600 (Fri, 09 Jan 2009) | 10 lines

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

........
r168198 | russell | 2009-01-09 16:14:38 -0600 (Fri, 09 Jan 2009) | 2 lines

Make this compile for mvanbaak

........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/res/res_musiconhold.c

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

Modified: branches/1.6.0/res/res_musiconhold.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/res/res_musiconhold.c?view=diff&rev=168204&r1=168203&r2=168204
==============================================================================
--- branches/1.6.0/res/res_musiconhold.c (original)
+++ branches/1.6.0/res/res_musiconhold.c Fri Jan  9 16:22:29 2009
@@ -185,7 +185,7 @@
 static int reload(void);
 
 #define mohclass_ref(class)   (ao2_ref((class), +1), class)
-#define mohclass_unref(class) (ao2_ref((class), -1), NULL)
+#define mohclass_unref(class) (ao2_ref((class), -1), (struct mohclass *) NULL)
 
 static void moh_files_release(struct ast_channel *chan, void *data)
 {