Changes in pjproject/main/pjlib/src/pj/sock_select.c [1:3]

File:

• pjproject/main/pjlib/src/pj/sock_select.c (modified) (4 diffs, 1 prop)

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

@@ -1 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/sock_select.c 4     10/14/05 12:26a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/sock_select.c $
- * 
- * 4     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 3     9/21/05 1:39p Bennylp
- * Periodic checkin for backup.
- * 
- * 2     9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
- * 1     9/15/05 8:40p Bennylp
- * Created.
+/* $Id$
+ *
  */
 #include <pj/sock_select.h>
@@ -21 +8 @@
 #include <pj/errno.h>
 
+#if defined(PJ_HAS_STRING_H) && PJ_HAS_STRING_H!=0
+#   include <string.h>
+#endif
 
 #ifdef _MSC_VER
@@ -26 +16 @@
 #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 +87 @@
     }
 
-    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);
 }