Changeset 752 for trunk/server/lib/replace/poll.c

Timestamp:

Nov 29, 2012, 2:06:31 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9 2nd part

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/replace/poll.c (modified) (2 diffs)

trunk/server/lib/replace/poll.c

@@ -31 +31 @@
 #include "replace.h"
 #include "system/select.h"
-
-#ifdef __OS2__
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
@@ -45 +46 @@
         nfds_t i;
 
-        if (fds == NULL) {
+        if ((fds == NULL) && (nfds != 0)) {
                 errno = EFAULT;
                 return -1;