epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

minimize preprocessor branching for vxWorks

Browse Source
This commit is contained in:
Unknown
2012-09-06 17:13:19 +02:00
parent d19508256f
commit d8ff75900e
6 changed files with 20 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pvAccessApp/rpcService/rpcServer.cpp
View File

@@ -6,8 +6,17 @@
#include <stdexcept>
#include <rpcServer.h>
#ifdef __vxworks
#include <envLib.h>
using std::string;
inline int setenv(const char *name, const char *value, int overwrite)
{
string e(name);
e += "=";
e += value;
return putenv(const_cast<char*>(e.c_str()));
}
#endif
using namespace epics::pvData;
@@ -403,11 +412,7 @@ RPCServer::RPCServer()
m_channelProviderImpl.reset(new RPCChannelProvider());
registerChannelProvider(m_channelProviderImpl);
#ifdef __vxworks
putenv(const_cast<char*>(("EPICS4_CAS_PROVIDER_NAMES=" + m_channelProviderImpl->getProviderName()).c_str()));
#else
setenv("EPICS4_CAS_PROVIDER_NAMES", m_channelProviderImpl->getProviderName().c_str(), 1);
#endif
m_serverContext = ServerContextImpl::create();
m_serverContext->initialize(getChannelAccess());