[asterisk-commits] jrose: trunk r331717 - in /trunk: ./ apps/app_dial.c apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: jrose
Date: Fri Aug 12 13:03:29 2011
New Revision: 331717

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=331717
Log:
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
  ........
................

Modified:
    trunk/   (props changed)
    trunk/apps/app_dial.c
    trunk/apps/app_meetme.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_dial.c?view=diff&rev=331717&r1=331716&r2=331717
==============================================================================
--- trunk/apps/app_dial.c (original)
+++ trunk/apps/app_dial.c Fri Aug 12 13:03:29 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: trunk/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_meetme.c?view=diff&rev=331717&r1=331716&r2=331717
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Fri Aug 12 13:03:29 2011
@@ -630,9 +630,9 @@
 /* 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,