summaryrefslogtreecommitdiff
path: root/pjnath/src
diff options
context:
space:
mode:
authorLiong Sauw Ming <ming@teluu.com>2011-04-26 03:07:24 +0000
committerLiong Sauw Ming <ming@teluu.com>2011-04-26 03:07:24 +0000
commit0af1d2bb99bc9068a06d65511af68bd10f731ba2 (patch)
tree715329f32d2daf544d05d7ae956d9830f242d282 /pjnath/src
parentd8dc4b6a36d794d9589630be96b9eb7e9b142f1a (diff)
Fixed #1246: Use CFHost for pj_getaddrinfo() on iOS
* Replace the fix for ticket #1104 with this fix * Modify pjturn-client/client_main's shutdown() function which conflicts with an existing function Re-run configure-iphone to use this fix automatically. git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3543 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjnath/src')
-rw-r--r--pjnath/src/pjturn-client/client_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/pjnath/src/pjturn-client/client_main.c b/pjnath/src/pjturn-client/client_main.c
index 0fbe85dd..31c48a12 100644
--- a/pjnath/src/pjturn-client/client_main.c
+++ b/pjnath/src/pjturn-client/client_main.c
@@ -185,7 +185,7 @@ static int init()
}
-static int shutdown()
+static int client_shutdown()
{
unsigned i;
@@ -625,7 +625,7 @@ int main(int argc, char *argv[])
console_main();
on_return:
- shutdown();
+ client_shutdown();
return status ? 1 : 0;
}