summaryrefslogtreecommitdiff
path: root/poll/unix
diff options
context:
space:
mode:
authorbrianp <brianp@13f79535-47bb-0310-9956-ffa450edef68>2002-08-02 05:12:35 +0000
committerbrianp <brianp@13f79535-47bb-0310-9956-ffa450edef68>2002-08-02 05:12:35 +0000
commit7047b470aae013a0557889cfe71ace79a6cdeb07 (patch)
tree86df0d8a77a61af4e07c292dc83c0eacc583728e /poll/unix
parent90b20fc089e8ac32304f89cbbb739c4340edd77e (diff)
downloadlibapr-7047b470aae013a0557889cfe71ace79a6cdeb07.tar.gz
One more fix for socket/file incompatibility on win32
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63761 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'poll/unix')
-rw-r--r--poll/unix/poll.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/poll/unix/poll.c b/poll/unix/poll.c
index 37b834dce..ffb54f5d3 100644
--- a/poll/unix/poll.c
+++ b/poll/unix/poll.c
@@ -254,7 +254,7 @@ APR_DECLARE(apr_status_t) apr_poll(apr_pollfd_t *aprset, int num, apr_int32_t *n
}
else {
#ifdef WIN32
- return EBADF;
+ return APR_EBADF;
#else
fd = aprset[i].desc.f->filedes;
#endif
@@ -351,7 +351,11 @@ APR_DECLARE(apr_status_t) apr_pollset_add(apr_pollset_t *pollset,
fd = descriptor->desc.s->socketdes;
}
else {
+#ifdef WIN32
+ return APR_EBADF;
+#else
fd = descriptor->desc.f->filedes;
+#endif
}
if (descriptor->reqevents & APR_POLLIN) {
FD_SET(fd, &(pollset->readset));