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/branches/1.8@331578 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 65f5666f2f5ddb80a6b36754fdd814fc470113fd..4b0d44f4383e509a9a2d32296afc8c829b249924 100644 (file)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -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,

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index adcc7c36a22826a41abfb2edb2edfbcfafc4039e..21d8ffc9518e6b975e2d5c48cd68d472e5d59bdd 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -604,12 +604,12 @@ 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),
 };
 
-/* !If set play an intro announcement at start of conference */
-#define CONFFLAG_INTROMSG ((uint64_t)1 << 32)
+/*! Do not write any audio to this channel until the state is up. */
+#define CONFFLAG_NO_AUDIO_UNTIL_UP  (1UL << 31)
+/*! If set play an intro announcement at start of conference */
+#define CONFFLAG_INTROMSG           (1UL << 32)
 
 enum {
        OPT_ARG_WAITMARKED = 0,