diff options
| author | Jason Parker <jparker@digium.com> | 2011-08-11 21:55:48 +0000 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2011-08-11 21:55:48 +0000 |
| commit | 1a8069abe2fc18e20e1cf2626f4bfc9e2e6d56dc (patch) | |
| tree | 79e2dcf72e64b556c3ee94e996fe6370cc6634a7 /apps/app_meetme.c | |
| parent | e12184cf952d046e29b7aaa3354f4b080e022947 (diff) | |
Merged revisions 331579 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10
................
r331579 | qwell | 2011-08-11 16:54:54 -0500 (Thu, 11 Aug 2011) | 13 lines
Merged revisions 331578 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r331578 | qwell | 2011-08-11 16:46:39 -0500 (Thu, 11 Aug 2011) | 6 lines
Use proper values for 64-bit option flags.
Also, reusing bits es no bueno, so change the value of a duplicate.
(issue ASTERISK-18239)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331580 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index f0ab25903..e98be8da4 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -625,14 +625,14 @@ enum { CONFFLAG_KICK_CONTINUE = (1 << 28), CONFFLAG_DURATION_STOP = (1 << 29), CONFFLAG_DURATION_LIMIT = (1 << 30), - /*! Do not write any audio to this channel until the state is up. */ - CONFFLAG_NO_AUDIO_UNTIL_UP = (1 << 31), }; /* 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 CONFFLAG_INTROMSG is. */ -#define CONFFLAG_INTROMSG ((uint64_t)1 << 32) /*!< If set play an intro announcement at start of conference */ -#define CONFFLAG_INTROUSER_VMREC ((uint64_t)1 << 33) + 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) enum { OPT_ARG_WAITMARKED = 0, |