summaryrefslogtreecommitdiff
path: root/pjlib/src
diff options
context:
space:
mode:
authorBenny Prijono <bennylp@teluu.com>2008-07-25 10:45:34 +0000
committerBenny Prijono <bennylp@teluu.com>2008-07-25 10:45:34 +0000
commit2434bdddfe484d84c0fb9641875e8b9cbd2a22b0 (patch)
tree0413caac1f14afb3f10e2622bfb40692d9ff388b /pjlib/src
parent9d29e15eadae49726b4abc0b357eafe125145984 (diff)
Fixed linking errors in pjnath when TCP is disabled in PJLIB
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2177 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib/src')
-rw-r--r--pjlib/src/pj/activesock.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/pjlib/src/pj/activesock.c b/pjlib/src/pj/activesock.c
index c4288a2a..45173c5b 100644
--- a/pjlib/src/pj/activesock.c
+++ b/pjlib/src/pj/activesock.c
@@ -75,13 +75,14 @@ static void ioqueue_on_read_complete(pj_ioqueue_key_t *key,
static void ioqueue_on_write_complete(pj_ioqueue_key_t *key,
pj_ioqueue_op_key_t *op_key,
pj_ssize_t bytes_sent);
+#if PJ_HAS_TCP
static void ioqueue_on_accept_complete(pj_ioqueue_key_t *key,
pj_ioqueue_op_key_t *op_key,
pj_sock_t sock,
pj_status_t status);
static void ioqueue_on_connect_complete(pj_ioqueue_key_t *key,
pj_status_t status);
-
+#endif
PJ_DEF(void) pj_activesock_cfg_default(pj_activesock_cfg *cfg)
{
@@ -121,8 +122,10 @@ PJ_DEF(pj_status_t) pj_activesock_create( pj_pool_t *pool,
pj_bzero(&ioq_cb, sizeof(ioq_cb));
ioq_cb.on_read_complete = &ioqueue_on_read_complete;
ioq_cb.on_write_complete = &ioqueue_on_write_complete;
+#if PJ_HAS_TCP
ioq_cb.on_connect_complete = &ioqueue_on_connect_complete;
ioq_cb.on_accept_complete = &ioqueue_on_accept_complete;
+#endif
status = pj_ioqueue_register_sock(pool, ioqueue, sock, asock,
&ioq_cb, &asock->key);
@@ -487,7 +490,7 @@ static void ioqueue_on_write_complete(pj_ioqueue_key_t *key,
}
}
-
+#if PJ_HAS_TCP
PJ_DEF(pj_status_t) pj_activesock_start_accept(pj_activesock_t *asock,
pj_pool_t *pool)
{
@@ -577,7 +580,6 @@ PJ_DEF(pj_status_t) pj_activesock_start_connect( pj_activesock_t *asock,
return pj_ioqueue_connect(asock->key, remaddr, addr_len);
}
-
static void ioqueue_on_connect_complete(pj_ioqueue_key_t *key,
pj_status_t status)
{
@@ -594,4 +596,5 @@ static void ioqueue_on_connect_complete(pj_ioqueue_key_t *key,
}
}
}
+#endif /* PJ_HAS_TCP */