From d597a7e36a0a8c4cbee70b053c41aa01afeab6b5 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Fri, 30 Apr 2010 08:27:56 +0100
Subject: [PATCH] Looks like the linux apr version is a bit too old to build
5458d58b4cd0. Use this workaround for now.
---
indra/llplugin/llpluginprocessparent.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp
index 9d510e737de..3589b22a771 100644
--- a/indra/llplugin/llpluginprocessparent.cpp
+++ b/indra/llplugin/llpluginprocessparent.cpp
@@ -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
}
}
}
--
GitLab