summaryrefslogtreecommitdiff
path: root/poll
diff options
context:
space:
mode:
authorbjh <bjh@13f79535-47bb-0310-9956-ffa450edef68>2004-02-28 01:40:44 +0000
committerbjh <bjh@13f79535-47bb-0310-9956-ffa450edef68>2004-02-28 01:40:44 +0000
commitecbaacec63aa10a7cd545acb14e13d1c3c630234 (patch)
tree88c54d7f95801bc0d9380b08e8cef27d02cdf867 /poll
parent1d81c5fb74253b7bba43b6fa0692b5fa3de6a2d6 (diff)
downloadlibapr-ecbaacec63aa10a7cd545acb14e13d1c3c630234.tar.gz
OS/2: In apr_pollset_poll(), allow descriptors to be NULL.
This makes it consistent with the unix implementation. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64929 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'poll')
-rw-r--r--poll/os2/pollset.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/poll/os2/pollset.c b/poll/os2/pollset.c
index 4c054c496..f6722182b 100644
--- a/poll/os2/pollset.c
+++ b/poll/os2/pollset.c
@@ -214,6 +214,9 @@ APR_DECLARE(apr_status_t) apr_pollset_poll(apr_pollset_t *pollset,
}
}
- *descriptors = pollset->result_set;
+ if (descriptors) {
+ *descriptors = pollset->result_set;
+ }
+
return APR_SUCCESS;
}