Changeset 1785 for pjproject/trunk

Timestamp:

Feb 8, 2008 9:43:30 AM (17 years ago)

Author:

bennylp

Message:

Fixed compilation errors on Symbian and others caused by ticket #472 (FD_SETSIZE was removed)

Location:

pjproject/trunk

Files:

• pjlib-util/src/pjlib-util/stun_simple_client.c (modified) (1 diff)
• pjlib/src/pj/sock_select_symbian.cpp (modified) (2 diffs)
• pjlib/src/pjlib-test/select.c (modified) (1 diff)

pjproject/trunk/pjlib-util/src/pjlib-util/stun_simple_client.c

@@ -145 +145 @@
             }
 
-            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;

pjproject/trunk/pjlib/src/pj/sock_select_symbian.cpp

@@ -27 +27 @@
 {
     unsigned     count;
-    CPjSocket   *sock[FD_SETSIZE];
+    CPjSocket   *sock[PJ_IOQUEUE_MAX_HANDLES];
 };
 
@@ -42 +42 @@
     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;
 }

pjproject/trunk/pjlib/src/pjlib-test/select.c

@@ -75 +75 @@
     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)