projects
/
platform
/
upstream
/
libnice.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f55c780
)
candidate: Use explicit 64-bit constants to make 32-bit gcc happy
author
Olivier Crête
<olivier.crete@collabora.com>
Mon, 31 Mar 2014 21:45:36 +0000
(17:45 -0400)
committer
Olivier Crête
<olivier.crete@collabora.com>
Mon, 31 Mar 2014 21:45:36 +0000
(17:45 -0400)
agent/candidate.c
patch
|
blob
|
history
diff --git
a/agent/candidate.c
b/agent/candidate.c
index
7d66560
..
348d216
100644
(file)
--- 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);
}
/*