From: Jonathan Rose <jrose@digium.com>
Date: Fri, 12 Aug 2011 15:49:17 +0000 (+0000)
Subject: Fixes 32bit compilation warnings brought on by 331634 in app_dial and app_meetme
X-Git-Tag: 1.8.7.0-rc1~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=427d1167cd32a2fc62899dfc0fb7927b8a22afa6;p=thirdparty%2Fasterisk.git

Fixes 32bit compilation warnings brought on by 331634 in app_dial and app_meetme

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@331635 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 4b0d44f438..515fa1b3f6 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -556,16 +556,16 @@ enum {
 };
 
 /* 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)
+#define DIAL_STILLGOING      (1LLU << 31)
+#define DIAL_NOFORWARDHTML   (1LLU << 32)
+#define DIAL_CALLERID_ABSENT (1LLU << 33) /* TRUE if caller id is not available for connected line. */
+#define OPT_CANCEL_ELSEWHERE (1LLU << 34)
+#define OPT_PEER_H           (1LLU << 35)
+#define OPT_CALLEE_GO_ON     (1LLU << 36)
+#define OPT_CANCEL_TIMEOUT   (1LLU << 37)
+#define OPT_FORCE_CID_TAG    (1LLU << 38)
+#define OPT_FORCE_CID_PRES   (1LLU << 39)
+#define OPT_CALLER_ANSWER    (1LLU << 40)
 
 enum {
 	OPT_ARG_ANNOUNCE = 0,
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 21d8ffc951..2bb02f0ed8 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -607,9 +607,9 @@ enum {
 };
 
 /*! Do not write any audio to this channel until the state is up. */
-#define CONFFLAG_NO_AUDIO_UNTIL_UP  (1UL << 31)
+#define CONFFLAG_NO_AUDIO_UNTIL_UP  (1ULL << 31)
 /*! If set play an intro announcement at start of conference */
-#define CONFFLAG_INTROMSG           (1UL << 32)
+#define CONFFLAG_INTROMSG           (1ULL << 32)
 
 enum {
 	OPT_ARG_WAITMARKED = 0,