[Pkg-telepathy-commits] [libnice] 195/265: candidate: Use explicit 64-bit constants to make 32-bit gcc happy

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository libnice.

commit 5fff876ce18c69a8445b416c70825e9204205f78
Author: Olivier Crête <olivier.crete at collabora.com>
Date:   Mon Mar 31 17:45:36 2014 -0400

    candidate: Use explicit 64-bit constants to make 32-bit gcc happy
---
 agent/candidate.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/agent/candidate.c b/agent/candidate.c
index 7d66560..348d216 100644
--- a/agent/candidate.c
+++ b/agent/candidate.c
@@ -163,8 +163,11 @@ nice_candidate_pair_priority (guint32 o_prio, guint32 a_prio)
 {
   guint32 max = o_prio > a_prio ? o_prio : a_prio;
   guint32 min = o_prio < a_prio ? o_prio : a_prio;
+  /* These two constants are here explictly to make some version of GCC happy */
+  const guint64 one = 1;
+  const guint64 thirtytwo = 32;
 
-  return ((guint64)1 << 32) * min + 2 * max + (o_prio > a_prio ? 1 : 0);
+  return (one << thirtytwo) * min + 2 * max + (o_prio > a_prio ? 1 : 0);
 }
 
 /*

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/libnice.git