From 39fe851e7961357f7f86f3d7f117f4c2e20dd646 Mon Sep 17 00:00:00 2001
From: Jonathan Rose <jrose@digium.com>
Date: Fri, 12 Aug 2011 18:03:29 +0000
Subject: [PATCH] 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
---
 apps/app_dial.c   | 20 ++++++++++----------
 apps/app_meetme.c |  6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

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 e98be8da46..b4fa0972c0 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,