diff options
| author | Benny Prijono <bennylp@teluu.com> | 2009-11-10 05:54:58 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2009-11-10 05:54:58 +0000 |
| commit | 212c97343b2e18dbe78ffd05ade1d18cb364b281 (patch) | |
| tree | b99d94578edd6792429fb6e9a46c61bea3d0061e | |
| parent | 89dac37fcca7f9c67ef9fb417f802f86c620bd37 (diff) | |
Misc (#951): fixed misc compilation warnings with gcc
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3005 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjnath/src/pjnath/ice_session.c | 2 | ||||
| -rw-r--r-- | third_party/g7221/common/basic_op_i.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pjnath/src/pjnath/ice_session.c b/pjnath/src/pjnath/ice_session.c index e71b6946..c83bc49f 100644 --- a/pjnath/src/pjnath/ice_session.c +++ b/pjnath/src/pjnath/ice_session.c @@ -531,7 +531,9 @@ PJ_DEF(pj_status_t) pj_ice_sess_set_prefs(pj_ice_sess *ice, ice->prefs = (pj_uint8_t*) pj_pool_calloc(ice->pool, PJ_ARRAY_SIZE(prefs), sizeof(pj_uint8_t)); for (i=0; i<4; ++i) { +#if PJ_ICE_CAND_TYPE_PREF_BITS < 8 pj_assert(prefs[i] < (2 << PJ_ICE_CAND_TYPE_PREF_BITS)); +#endif ice->prefs[i] = prefs[i]; } return PJ_SUCCESS; diff --git a/third_party/g7221/common/basic_op_i.h b/third_party/g7221/common/basic_op_i.h index 8eba815e..d6906237 100644 --- a/third_party/g7221/common/basic_op_i.h +++ b/third_party/g7221/common/basic_op_i.h @@ -99,7 +99,7 @@ PJ_INLINE(Word16) saturate (Word32 L_var1) if (val16 == L_var1) return val16; - if (val16 > MAX_16) + if (L_var1 > MAX_16) return MAX_16; return MIN_16; } |