diff --git a/runScript.c b/runScript.c index ff6543f..fc27362 100644 --- a/runScript.c +++ b/runScript.c @@ -26,11 +26,8 @@ #if defined (_WIN32) #include "asprintf.h" - #endif -#define IS_ABS_PATH(filename) (filename[0] == '/') /* may be different for other OS */ - #ifdef BASE_VERSION #define EPICS_3_13 extern char** ppGlobalEnviron; @@ -45,6 +42,8 @@ epicsShareFunc int epicsShareAPI iocshCmd(const char *cmd); #include #endif +#define IS_ABS_PATH(filename) (filename[0] == OSI_PATH_SEPARATOR[0]) /* may be different for other OS ? */ + #include "require.h" int runScriptDebug=0; @@ -167,9 +166,7 @@ int runScript(const char* filename, const char* args) return -1; } - pairs = (char*[]){ "", "environ", NULL, NULL }; - - if (macCreateHandle(&mac, pairs) != 0) goto error; + if (macCreateHandle(&mac,(char*[]){ "", "environ", NULL, NULL }) != 0) goto error; macSuppressWarning(mac, 1); #ifdef EPICS_3_13 /* Have no environment macro substitution, thus load envionment explicitly */