aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-09 22:23:57 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-09 22:23:57 +0000
commit4adc2b366c6efdeea46ed08b78546e8d008eeae7 (patch)
tree3b387275ede7ca007548dd00b93280e63a835c2e /res
parentd7c552f3a297e2392f964ecc79fff112da8426c0 (diff)
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 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@168209 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r--res/res_musiconhold.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index f8c05e706..6bde1dbe0 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -186,7 +186,7 @@ static struct ao2_container *mohclasses;
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)
{