Skip to content
Snippets Groups Projects
Commit d597a7e3 authored by Tofu Linden's avatar Tofu Linden
Browse files

Looks like the linux apr version is a bit too old to build 5458d58b4cd0. Use...

Looks like the linux apr version is a bit too old to build 5458d58b4cd0.  Use this workaround for now.
parent e4ac9147
No related branches found
No related tags found
No related merge requests found
......@@ -670,12 +670,15 @@ void LLPluginProcessParent::updatePollset()
{
if(!sPollSet && (count > 0))
{
#ifdef APR_POLLSET_NOCOPY
// The pollset doesn't exist yet. Create it now.
apr_status_t status = apr_pollset_create(&sPollSet, count, gAPRPoolp, APR_POLLSET_NOCOPY);
if(status != APR_SUCCESS)
{
#endif // APR_POLLSET_NOCOPY
LL_WARNS("PluginPoll") << "Couldn't create pollset. Falling back to non-pollset mode." << LL_ENDL;
sPollSet = NULL;
#ifdef APR_POLLSET_NOCOPY
}
else
{
......@@ -698,6 +701,7 @@ void LLPluginProcessParent::updatePollset()
}
}
}
#endif // APR_POLLSET_NOCOPY
}
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment