diff options
| author | Jonathan Rose <jrose@digium.com> | 2011-08-12 18:03:29 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2011-08-12 18:03:29 +0000 |
| commit | 39fe851e7961357f7f86f3d7f117f4c2e20dd646 (patch) | |
| tree | 44afda8c1e237230d913aad5028799015f4c53a4 /apps/app_meetme.c | |
| parent | 452f198609673ba60687f425bdd43cfb9e04d2ec (diff) | |
Merged revisions 331644 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10
................
r331644 | jrose | 2011-08-12 11:18:57 -0500 (Fri, 12 Aug 2011) | 9 lines
Merged revisions 331635 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r331635 | jrose | 2011-08-12 10:49:17 -0500 (Fri, 12 Aug 2011) | 1 line
Fixes 32bit compilation warnings brought on by 331634 in app_dial and app_meetme
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331717 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index e98be8da4..b4fa0972c 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -630,9 +630,9 @@ enum { /* These flags are defined separately because we ran out of bits that an enum can be used to represent. If you add new flags, be sure to do it in the same way that these are. */ /*! Do not write any audio to this channel until the state is up. */ -#define CONFFLAG_NO_AUDIO_UNTIL_UP (1UL << 31) -#define CONFFLAG_INTROMSG (1UL << 32) /*!< If set play an intro announcement at start of conference */ -#define CONFFLAG_INTROUSER_VMREC (1UL << 33) +#define CONFFLAG_NO_AUDIO_UNTIL_UP (1ULL << 31) +#define CONFFLAG_INTROMSG (1ULL << 32) /*!< If set play an intro announcement at start of conference */ +#define CONFFLAG_INTROUSER_VMREC (1ULL << 33) enum { OPT_ARG_WAITMARKED = 0, |