Changeset 2 for pjproject/main/pjlib/src/pj/sock_select.c

Timestamp:

Nov 1, 2005 4:42:51 PM (18 years ago)

Author:

bennylp

Message:

Added suppor /and fix things for SunOS port

File:

• pjproject/main/pjlib/src/pj/sock_select.c (modified) (3 diffs)

pjproject/main/pjlib/src/pj/sock_select.c

@@ -21 +21 @@
 #include <pj/errno.h>
 
+#if defined(PJ_HAS_STRING_H) && PJ_HAS_STRING_H!=0
+#   include <string.h>
+#endif
 
 #ifdef _MSC_VER
@@ -26 +29 @@
 #endif
 
-#define PART_FDSET(p_fdsetp)    ((fd_set*)&p_fdsetp->data[1])
-#define PART_COUNT(p_fdsetp)    (p_fdsetp->data[0])
+#define PART_FDSET(ps)          ((fd_set*)&ps->data[1])
+#define PART_FDSET_OR_NULL(ps)  (ps ? PART_FDSET(ps) : NULL)
+#define PART_COUNT(ps)          (ps->data[0])
 
 PJ_DEF(void) PJ_FD_ZERO(pj_fd_set_t *fdsetp)
@@ -96 +100 @@
     }
 
-    return select(n, PART_FDSET(readfds), PART_FDSET(writefds),
-                  PART_FDSET(exceptfds), p_os_timeout);
+    return select(n, PART_FDSET_OR_NULL(readfds), PART_FDSET_OR_NULL(writefds),
+                  PART_FDSET_OR_NULL(exceptfds), p_os_timeout);
 }