kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 04:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 331579 via svnmerge from

Browse Source 
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
This commit is contained in:
Jason Parker
2011-08-11 21:55:48 +00:00
parent e12184cf95
commit 1a8069abe2
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
apps/app_dial.c
View File

@@ -553,18 +553,19 @@ enum {
OPT_CALLEE_GOSUB = (1 << 28),
OPT_CALLEE_MIXMONITOR = (1 << 29),
OPT_CALLER_MIXMONITOR = (1 << 30),
OPT_CALLER_ANSWER = (1 << 31),
};
#define DIAL_STILLGOING (1 << 31)
#define DIAL_NOFORWARDHTML ((uint64_t)1 << 32) /* flags are now 64 bits, so keep it up! */
#define DIAL_CALLERID_ABSENT ((uint64_t)1 << 33) /* TRUE if caller id is not available for connected line. */
#define OPT_CANCEL_ELSEWHERE ((uint64_t)1 << 34)
#define OPT_PEER_H ((uint64_t)1 << 35)
#define OPT_CALLEE_GO_ON ((uint64_t)1 << 36)
#define OPT_CANCEL_TIMEOUT ((uint64_t)1 << 37)
#define OPT_FORCE_CID_TAG ((uint64_t)1 << 38)
#define OPT_FORCE_CID_PRES ((uint64_t)1 << 39)
/* flags are now 64 bits, so keep it up! */
#define DIAL_STILLGOING (1LU << 31)
#define DIAL_NOFORWARDHTML (1LU << 32)
#define DIAL_CALLERID_ABSENT (1LU << 33) /* TRUE if caller id is not available for connected line. */
#define OPT_CANCEL_ELSEWHERE (1LU << 34)
#define OPT_PEER_H (1LU << 35)
#define OPT_CALLEE_GO_ON (1LU << 36)
#define OPT_CANCEL_TIMEOUT (1LU << 37)
#define OPT_FORCE_CID_TAG (1LU << 38)
#define OPT_FORCE_CID_PRES (1LU << 39)
#define OPT_CALLER_ANSWER (1LU << 40)
enum {
OPT_ARG_ANNOUNCE = 0,

10
apps/app_meetme.c
View File

@@ -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,