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

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/replace/poll.c (copied) (copied from vendor/current/lib/replace/poll.c ) (2 diffs)

trunk/server/lib/replace/poll.c

@@ -32 +32 @@
 #include "system/select.h"
 
+#ifdef __OS2__
+#include <sys/time.h>
+#include <sys/ioctl.h>
+#endif
 
 int rep_poll(struct pollfd *fds, nfds_t nfds, int timeout)
@@ -126 +130 @@
                                 & (POLLPRI | POLLRDBAND);
                 }
+#ifdef __OS2__ // if we only increment rc when no POLLHUB we loop
+                if (fds[i].revents != 0) {
+#else
                 if (fds[i].revents & ~POLLHUP) {
+#endif
                         rc++;
                 }