[asterisk-commits] jrose: branch 1.8 r331635 - in /branches/1.8/apps: app_dial.c app_meetme.c

[SVN commits to the Asterisk project]

Author: jrose
Date: Fri Aug 12 10:49:17 2011
New Revision: 331635

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=331635
Log:
Fixes 32bit compilation warnings brought on by 331634 in app_dial and app_meetme

Modified:
    branches/1.8/apps/app_dial.c
    branches/1.8/apps/app_meetme.c

Modified: branches/1.8/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/apps/app_dial.c?view=diff&rev=331635&r1=331634&r2=331635
==============================================================================
--- branches/1.8/apps/app_dial.c (original)
+++ branches/1.8/apps/app_dial.c Fri Aug 12 10:49:17 2011
@@ -556,16 +556,16 @@
 };
 
 /* 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,

Modified: branches/1.8/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/apps/app_meetme.c?view=diff&rev=331635&r1=331634&r2=331635
==============================================================================
--- branches/1.8/apps/app_meetme.c (original)
+++ branches/1.8/apps/app_meetme.c Fri Aug 12 10:49:17 2011
@@ -607,9 +607,9 @@
 };
 
 /*! 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,