diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-09 22:22:29 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-09 22:22:29 +0000 |
| commit | 262aa746fa3222b5c502655abf462696357f6004 (patch) | |
| tree | 29f892c6891f6b8d46b24b7ec0e079176974f6f4 /res | |
| parent | 31057a16f7cc3bd004ce14394e88d418a0cc47b0 (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.0@168204 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_musiconhold.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index fa3fea9d4..9656ae02b 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -185,7 +185,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) { |