summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Prijono <bennylp@teluu.com>2008-05-20 08:51:03 +0000
committerBenny Prijono <bennylp@teluu.com>2008-05-20 08:51:03 +0000
commit85dfa7e4d7cad3a95276fa829af357b372b72a8a (patch)
treef346e9b0767d6edeb8b18fb2341e56bc6122a64c
parent99cee13d826450735fbe4d0891c8d286a861d4e8 (diff)
Fixed Symbian build error caused by active socket addition to pjlib in ticket #531 (thanks Rodrigo Vega)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1962 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r--build.symbian/pjlib.mmp1
-rw-r--r--build.symbian/pjlib_test.mmp1
-rw-r--r--pjlib/src/pj/activesock.c4
3 files changed, 4 insertions, 2 deletions
diff --git a/build.symbian/pjlib.mmp b/build.symbian/pjlib.mmp
index 07cf0d92..db396672 100644
--- a/build.symbian/pjlib.mmp
+++ b/build.symbian/pjlib.mmp
@@ -29,6 +29,7 @@ MACRO PJ_SYMBIAN=1
//
// Platform independent source
//
+SOURCE activesock.c
SOURCE array.c
SOURCE config.c
SOURCE ctype.c
diff --git a/build.symbian/pjlib_test.mmp b/build.symbian/pjlib_test.mmp
index 4c859d87..2f0738ee 100644
--- a/build.symbian/pjlib_test.mmp
+++ b/build.symbian/pjlib_test.mmp
@@ -21,6 +21,7 @@ OPTION GCC -x c++
// Test files
+SOURCE activesock.c
SOURCE atomic.c
SOURCE echo_clt.c
SOURCE errno.c
diff --git a/pjlib/src/pj/activesock.c b/pjlib/src/pj/activesock.c
index 10c47abe..112ca5f2 100644
--- a/pjlib/src/pj/activesock.c
+++ b/pjlib/src/pj/activesock.c
@@ -236,7 +236,7 @@ PJ_DEF(pj_status_t) pj_activesock_start_read(pj_activesock_t *asock,
struct read_op *r = &asock->read_op[i];
pj_ssize_t size_to_read;
- r->pkt = pj_pool_alloc(pool, buff_size);
+ r->pkt = (pj_uint8_t*)pj_pool_alloc(pool, buff_size);
r->max_size = size_to_read = buff_size;
status = pj_ioqueue_recv(asock->key, &r->op_key, r->pkt, &size_to_read,
@@ -272,7 +272,7 @@ PJ_DEF(pj_status_t) pj_activesock_start_recvfrom(pj_activesock_t *asock,
struct read_op *r = &asock->read_op[i];
pj_ssize_t size_to_read;
- r->pkt = pj_pool_alloc(pool, buff_size);
+ r->pkt = (pj_uint8_t*) pj_pool_alloc(pool, buff_size);
r->max_size = size_to_read = buff_size;
r->src_addr_len = sizeof(r->src_addr);