diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2013-02-27 10:16:08 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2013-02-27 10:16:08 +0000 |
| commit | e0b9872e5b72532014d4f2fd8116662cc92fdf64 (patch) | |
| tree | be3ac789db5892454d95b218849b56ebdcf24520 /pjsip-apps | |
| parent | 1703f7d9893e43ae31e81cb9de5b26420e2f6857 (diff) | |
Re #1559: Backported to 1.x, except r4312,r4330
git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/1.x@4387 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps')
| -rw-r--r-- | pjsip-apps/src/python/setup.py | 5 | ||||
| -rw-r--r-- | pjsip-apps/src/samples/icedemo.c | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pjsip-apps/src/python/setup.py b/pjsip-apps/src/python/setup.py index 6e3618d5..69a98594 100644 --- a/pjsip-apps/src/python/setup.py +++ b/pjsip-apps/src/python/setup.py @@ -87,8 +87,9 @@ f.close() if platform.system() == 'Darwin': extra_link_args = ["-framework", "CoreFoundation", "-framework", "AudioToolbox"] - # OS X Lion support - if platform.mac_ver()[0].startswith("10.7"): + version = platform.mac_ver()[0].split(".") + # OS X Lion (10.7.x) or above support + if version[0] == '10' and int(version[1]) >= 7: extra_link_args += ["-framework", "AudioUnit"] else: extra_link_args = [] diff --git a/pjsip-apps/src/samples/icedemo.c b/pjsip-apps/src/samples/icedemo.c index 79bdb5fa..943befb2 100644 --- a/pjsip-apps/src/samples/icedemo.c +++ b/pjsip-apps/src/samples/icedemo.c @@ -614,6 +614,7 @@ static int encode_session(char buffer[], unsigned maxlen) } /* Enumerate all candidates for this component */ + cand_cnt = PJ_ARRAY_SIZE(cand); status = pj_ice_strans_enum_cands(icedemo.icest, comp+1, &cand_cnt, cand); if (status != PJ_SUCCESS) |