diff options
author | Benny Prijono <bennylp@teluu.com> | 2008-02-08 09:43:30 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2008-02-08 09:43:30 +0000 |
commit | cbfbffa3025842391ac14e056410524a36abe0fb (patch) | |
tree | 38c2547b31036f07f0fc1731466e792d1cf7ca2d | |
parent | f00acd536547d268171d6f1c9ad64284893cea34 (diff) |
Fixed compilation errors on Symbian and others caused by ticket #472 (FD_SETSIZE was removed)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1785 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r-- | pjlib-util/src/pjlib-util/stun_simple_client.c | 2 | ||||
-rw-r--r-- | pjlib/src/pj/sock_select_symbian.cpp | 4 | ||||
-rw-r--r-- | pjlib/src/pjlib-test/select.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pjlib-util/src/pjlib-util/stun_simple_client.c b/pjlib-util/src/pjlib-util/stun_simple_client.c index aca26a91..32c2cae3 100644 --- a/pjlib-util/src/pjlib-util/stun_simple_client.c +++ b/pjlib-util/src/pjlib-util/stun_simple_client.c @@ -144,7 +144,7 @@ PJ_DEF(pj_status_t) pjstun_get_mapped_addr( pj_pool_factory *pf, PJ_FD_SET(sock[i], &r); } - select_rc = pj_sock_select(FD_SETSIZE, &r, NULL, NULL, &timeout); + select_rc = pj_sock_select(PJ_IOQUEUE_MAX_HANDLES, &r, NULL, NULL, &timeout); if (select_rc < 1) continue; diff --git a/pjlib/src/pj/sock_select_symbian.cpp b/pjlib/src/pj/sock_select_symbian.cpp index cf45a62d..d8ae730d 100644 --- a/pjlib/src/pj/sock_select_symbian.cpp +++ b/pjlib/src/pj/sock_select_symbian.cpp @@ -26,7 +26,7 @@ struct symbian_fd_set { unsigned count; - CPjSocket *sock[FD_SETSIZE]; + CPjSocket *sock[PJ_IOQUEUE_MAX_HANDLES]; }; @@ -41,7 +41,7 @@ PJ_DEF(void) PJ_FD_SET(pj_sock_t fd, pj_fd_set_t *fdsetp) { symbian_fd_set *fds = (symbian_fd_set *)fdsetp; - PJ_ASSERT_ON_FAIL(fds->count < FD_SETSIZE, return); + PJ_ASSERT_ON_FAIL(fds->count < PJ_IOQUEUE_MAX_HANDLES, return); fds->sock[fds->count++] = (CPjSocket*)fd; } diff --git a/pjlib/src/pjlib-test/select.c b/pjlib/src/pjlib-test/select.c index c3c3f8fc..8e0e5b30 100644 --- a/pjlib/src/pjlib-test/select.c +++ b/pjlib/src/pjlib-test/select.c @@ -74,7 +74,7 @@ static int do_select( pj_sock_t sock1, pj_sock_t sock2, timeout.sec = 1; timeout.msec = 0; - n = pj_sock_select(FD_SETSIZE, &fds[0], &fds[1], &fds[2], + n = pj_sock_select(PJ_IOQUEUE_MAX_HANDLES, &fds[0], &fds[1], &fds[2], &timeout); if (n < 0) return n; |