250c250,253
< rv = msgctl(pollset->p->msg_q, IPC_RMID, NULL);
---
> if (pollset->flags & APR_POLLSET_THREADSAFE) {
> rv = msgctl(pollset->p->msg_q, IPC_RMID, NULL);
> DBG1(4, "asio_pollset_cleanup: msgctl(IPC_RMID) returned %d\n", rv);
> }
252d254
< DBG1(4, "exiting, msgctl(IPC_RMID) returned %d\n", rv);
267c269
< priv = pollset->p = apr_palloc(p, sizeof(*priv));
---
> priv = pollset->p = apr_pcalloc(p, sizeof(*priv));
271c273
< if (rv = apr_thread_mutex_create(&(priv->ring_lock),
---
> if ((rv = apr_thread_mutex_create(&(priv->ring_lock),
273c275
< p) != APR_SUCCESS) {
---
> p)) != APR_SUCCESS) {
484c486,487
< struct aiocb cancel_a; /* AIO_CANCEL is synchronous, so autodata works fine */
---
> /* AIO_CANCEL is synchronous, so autodata works fine. */
> struct aiocb cancel_a = {0};
768c771
< static apr_pollset_provider_t impl = {
---
> static const apr_pollset_provider_t impl = {
777c780
< apr_pollset_provider_t *apr_pollset_provider_aio_msgq = &impl;
---
> const apr_pollset_provider_t *apr_pollset_provider_aio_msgq = &impl;