Skip to content
Snippets Groups Projects
Commit 3764406d authored by Dirk Zimoch's avatar Dirk Zimoch
Browse files

Merge branch 'master' of git.psi.ch:epics_driver_modules/require

parents c00c2519 6f065339
No related branches found
No related tags found
No related merge requests found
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <macLib.h> #include <macLib.h>
#include <dbAccess.h>
#include <initHooks.h> #include <initHooks.h>
#include <epicsVersion.h> #include <epicsVersion.h>
...@@ -23,6 +24,11 @@ ...@@ -23,6 +24,11 @@
#include <symLib.h> #include <symLib.h>
#endif #endif
#if defined (_WIN32)
#include "asprintf.h"
#endif
#define IS_ABS_PATH(filename) (filename[0] == '/') /* may be different for other OS */ #define IS_ABS_PATH(filename) (filename[0] == '/') /* may be different for other OS */
#ifdef BASE_VERSION #ifdef BASE_VERSION
...@@ -30,6 +36,8 @@ ...@@ -30,6 +36,8 @@
extern char** ppGlobalEnviron; extern char** ppGlobalEnviron;
#define OSI_PATH_SEPARATOR "/" #define OSI_PATH_SEPARATOR "/"
#define OSI_PATH_LIST_SEPARATOR ":" #define OSI_PATH_LIST_SEPARATOR ":"
extern volatile int interruptAccept;
#else #else
#include <osiFileName.h> #include <osiFileName.h>
#include <iocsh.h> #include <iocsh.h>
...@@ -435,7 +443,6 @@ void afterInitHook(initHookState state) ...@@ -435,7 +443,6 @@ void afterInitHook(initHookState state)
} }
} }
extern volatile int interruptAccept;
static int first_time = 1; static int first_time = 1;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment