From 57a8ec3b11324ca74ff6ce1372167e5fcd94444b Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Wed, 4 Nov 2015 11:39:46 +0100 Subject: [PATCH] fix for EPICS3.13.10/vxWorks environment --- runScript.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runScript.c b/runScript.c index 05ae70e..233b354 100644 --- a/runScript.c +++ b/runScript.c @@ -12,8 +12,8 @@ extern int execute(const char*); #ifdef BASE_VERSION #define EPICS_3_13 +extern char** ppGlobalEnviron; #include -extern char** environ; #else #include 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)