fix for EPICS3.13.10/vxWorks environment

This commit is contained in:
2015-11-04 11:39:46 +01:00
parent edf0992020
commit 57a8ec3b11
+2 -2
View File
@@ -12,8 +12,8 @@ extern int execute(const char*);
#ifdef BASE_VERSION
#define EPICS_3_13
extern char** ppGlobalEnviron;
#include <strdup.h>
extern char** environ;
#else
#include <iocsh.h>
epicsShareFunc int epicsShareAPI iocshCmd(const char *cmd);
@@ -48,7 +48,7 @@ int runScript(const char* filename, const char* args)
#ifdef EPICS_3_13
/* Have no environment macro substitution, thus load envionment explicitly */
/* Actually, environmant macro substitution was introduced in 3.14.3 */
for (pairs = environ; *pairs; pairs++)
for (pairs = ppGlobalEnviron; *pairs; pairs++)
{
char* var, *eq;
if (runScriptDebug)