diff options
| author | ianh <ianh@13f79535-47bb-0310-9956-ffa450edef68> | 2002-08-02 04:53:47 +0000 |
|---|---|---|
| committer | ianh <ianh@13f79535-47bb-0310-9956-ffa450edef68> | 2002-08-02 04:53:47 +0000 |
| commit | 1e05cab398ab0fb490b36e18f3ba07d2cd3caed6 (patch) | |
| tree | b1e6d7a9ad16c394f1e7efac7789ef23ca037b49 /poll | |
| parent | a7e26f16e8c5bfd1bdeca3908b34b65d8eb1606c (diff) | |
| download | libapr-1e05cab398ab0fb490b36e18f3ba07d2cd3caed6.tar.gz | |
c/unsigned int/SOCKET/ for win32
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63759 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'poll')
| -rw-r--r-- | poll/unix/poll.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/poll/unix/poll.c b/poll/unix/poll.c index f329d435d..8a68d8c6b 100644 --- a/poll/unix/poll.c +++ b/poll/unix/poll.c @@ -187,7 +187,11 @@ APR_DECLARE(apr_status_t) apr_poll(apr_pollfd_t *aprset, int num, apr_int32_t *n FD_ZERO(&exceptset); for (i = 0; i < num; i++) { +#ifdef WIN32 + SOCKET fd; +#else int fd; +#endif if (aprset[i].desc_type == APR_POLL_SOCKET) { fd = aprset[i].desc.s->socketdes; @@ -235,7 +239,11 @@ APR_DECLARE(apr_status_t) apr_poll(apr_pollfd_t *aprset, int num, apr_int32_t *n } for (i = 0; i < num; i++) { +#ifdef WIN32 + SOCKET fd; +#else int fd; +#endif if (aprset[i].desc_type == APR_POLL_SOCKET) { fd = aprset[i].desc.s->socketdes; @@ -308,8 +316,12 @@ APR_DECLARE(apr_status_t) apr_pollset_add(apr_pollset_t *pollset, const apr_pollfd_t *descriptor) { #ifndef HAVE_POLL +#ifdef WIN32 + SOCKET fd; +#else int fd; #endif +#endif if (pollset->nelts == pollset->nalloc) { return APR_ENOMEM; @@ -356,8 +368,12 @@ APR_DECLARE(apr_status_t) apr_pollset_remove(apr_pollset_t *pollset, { apr_uint32_t i; #ifndef HAVE_POLL +#ifdef WIN32 + SOCKET fd; +#else int fd; #endif +#endif #ifdef HAVE_POLL for (i = 0; i < pollset->nelts; i++) { @@ -484,7 +500,11 @@ APR_DECLARE(apr_status_t) apr_pollset_poll(apr_pollset_t *pollset, } j = 0; for (i = 0; i < pollset->nelts; i++) { +#ifdef WIN32 + SOCKET fd; +#else int fd; +#endif if (pollset->query_set[i].desc_type == APR_POLL_SOCKET) { fd = pollset->query_set[i].desc.s->socketdes; } |