diff --git a/require.c b/require.c index 598a16d..a07d224 100644 --- a/require.c +++ b/require.c @@ -1,3 +1,4 @@ +#include #include #include #include @@ -11,8 +12,11 @@ #include #include #include -#ifndef BASE_VERSION -/* This is R3.14.* */ +#ifdef BASE_VERSION +#define EPICS_3_13 +int dbLoadDatabase(char *filename, char *path, char *substitutions); +#else +#define EPICS_3_14 #include extern int iocshCmd (const char *cmd); #include @@ -20,7 +24,6 @@ extern int iocshCmd (const char *cmd); #include #endif -int dbLoadDatabase(char *filename, char *path, char *substitutions); int require(char* lib, char* version) { @@ -165,7 +168,7 @@ int require(char* lib, char* version) shellScriptAbort(); return ERROR; } -#ifndef BASE_VERSION +#ifdef EPICS_3_14 /* call register function for R3.14 */ { char initfunc[256]; @@ -251,7 +254,7 @@ int libversionShow(char* pattern) return OK; } -#ifndef BASE_VERSION +#ifdef EPICS_3_14 static const iocshArg requireArg0 = { "module", iocshArgString }; static const iocshArg requireArg1 = { "version", iocshArgString }; static const iocshArg * const requireArgs[2] = { &requireArg0, &requireArg1 };