From 3450c9d4422308f1b3eb46893caf8db2a3f37b5b Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Fri, 22 Nov 2019 21:17:16 -0800 Subject: [PATCH] softIoc use correct path sep --- modules/database/src/std/softIoc/softMain.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/database/src/std/softIoc/softMain.cpp b/modules/database/src/std/softIoc/softMain.cpp index 9d9f080cb..85a3b730d 100644 --- a/modules/database/src/std/softIoc/softMain.cpp +++ b/modules/database/src/std/softIoc/softMain.cpp @@ -37,12 +37,12 @@ extern "C" int softIoc_registerRecordDeviceDriver(struct dbBase *pdbbase); # error -DEPICS_BASE required #endif -#define DBD_BASE "dbd/softIoc.dbd" -#define EXIT_BASE "db/softIocExit.db" -#define DBD_FILE_REL "../../" DBD_BASE -#define EXIT_FILE_REL "../../" EXIT_BASE -#define DBD_FILE EPICS_BASE "/" DBD_BASE -#define EXIT_FILE EPICS_BASE "/" EXIT_BASE +#define DBD_BASE "dbd" OSI_PATH_SEPARATOR "softIoc.dbd" +#define EXIT_BASE "db" OSI_PATH_SEPARATOR "softIocExit.db" +#define DBD_FILE_REL ".." OSI_PATH_SEPARATOR ".." OSI_PATH_SEPARATOR DBD_BASE +#define EXIT_FILE_REL ".." OSI_PATH_SEPARATOR ".." OSI_PATH_SEPARATOR EXIT_BASE +#define DBD_FILE EPICS_BASE OSI_PATH_SEPARATOR DBD_BASE +#define EXIT_FILE EPICS_BASE OSI_PATH_SEPARATOR EXIT_BASE namespace {