commit 3569c0d5a7ab077d0f935d40900b9a0ce81faf06
author Benny Prijono <bennylp@teluu.com> Fri Apr 06 10:29:20 2007 +0000
committer Benny Prijono <bennylp@teluu.com> Fri Apr 06 10:29:20 2007 +0000
tree c1908636940a79cd1426b6db41340f87b2c290fe
parent 1b0ee294307e19577081e1f7da2c2754a1230f34

Fixed ticket #216: Build error when PJ_HAS_TCP is set to zero (thanks ChenHuan)

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@1159 74dad513-b988-da41-8d7b-12977e46ad98

pjlib/src/pj/ioqueue_common_abs.c

diff --git a/pjlib/src/pj/ioqueue_common_abs.c b/pjlib/src/pj/ioqueue_common_abs.c
index 2301ac9..82f962c 100644
--- a/pjlib/src/pj/ioqueue_common_abs.c
+++ b/pjlib/src/pj/ioqueue_common_abs.c
@@ -155,6 +155,7 @@
 #if PJ_HAS_TCP
     return !pj_list_empty(&key->accept_list);
 #else
+    PJ_UNUSED_ARG(key);
     return 0;
 #endif
 }

pjlib/src/pj/ioqueue_select.c

diff --git a/pjlib/src/pj/ioqueue_select.c b/pjlib/src/pj/ioqueue_select.c
index 7595e63..f5e3690 100644
--- a/pjlib/src/pj/ioqueue_select.c
+++ b/pjlib/src/pj/ioqueue_select.c
@@ -556,8 +556,10 @@
         PJ_FD_CLR((pj_sock_t)key->fd, &ioqueue->rfdset);
     else if (event_type == WRITEABLE_EVENT)
         PJ_FD_CLR((pj_sock_t)key->fd, &ioqueue->wfdset);
+#if defined(PJ_HAS_TCP) && PJ_HAS_TCP!=0
     else if (event_type == EXCEPTION_EVENT)
         PJ_FD_CLR((pj_sock_t)key->fd, &ioqueue->xfdset);
+#endif
     else
         pj_assert(0);
 
@@ -580,8 +582,10 @@
         PJ_FD_SET((pj_sock_t)key->fd, &ioqueue->rfdset);
     else if (event_type == WRITEABLE_EVENT)
         PJ_FD_SET((pj_sock_t)key->fd, &ioqueue->wfdset);
+#if defined(PJ_HAS_TCP) && PJ_HAS_TCP!=0
     else if (event_type == EXCEPTION_EVENT)
         PJ_FD_SET((pj_sock_t)key->fd, &ioqueue->xfdset);
+#endif
     else
         pj_assert(0);
 
@@ -649,8 +653,11 @@
      * Otherwise select() will return error.
      */
     if (PJ_FD_COUNT(&ioqueue->rfdset)==0 &&
-        PJ_FD_COUNT(&ioqueue->wfdset)==0 &&
-        PJ_FD_COUNT(&ioqueue->xfdset)==0)
+        PJ_FD_COUNT(&ioqueue->wfdset)==0 
+#if defined(PJ_HAS_TCP) && PJ_HAS_TCP!=0
+        && PJ_FD_COUNT(&ioqueue->xfdset)==0
+#endif
+	)
     {
 #if PJ_IOQUEUE_HAS_SAFE_UNREG
 	scan_closing_keys(ioqueue);

pjlib/src/pj/ioqueue_winnt.c

diff --git a/pjlib/src/pj/ioqueue_winnt.c b/pjlib/src/pj/ioqueue_winnt.c
index ce8cd5d..8d17878 100644
--- a/pjlib/src/pj/ioqueue_winnt.c
+++ b/pjlib/src/pj/ioqueue_winnt.c
@@ -366,7 +366,9 @@
  */
 PJ_DEF(pj_status_t) pj_ioqueue_destroy( pj_ioqueue_t *ioqueue )
 {
+#if PJ_HAS_TCP
     unsigned i;
+#endif
     pj_ioqueue_key_t *key;
 
     PJ_CHECK_STACK();
@@ -739,7 +741,9 @@
 PJ_DEF(int) pj_ioqueue_poll( pj_ioqueue_t *ioqueue, const pj_time_val *timeout)
 {
     DWORD dwMsec;
+#if PJ_HAS_TCP
     int connect_count = 0;
+#endif
     int event_count = 0;
 
     PJ_ASSERT_RETURN(ioqueue, -PJ_EINVAL);