EPICS_driver_modules/StreamDevice
0
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'windows_build_fix' of https://github.com/FreddieAkeroyd/StreamDevice

Browse Source
This commit is contained in:
zimoch
2020-03-02 09:13:38 +01:00
parent 4d3672994d b03726903d
commit 1378a9fcbb
3 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/AsynDriverInterface.cc
View File

@ -17,18 +17,6 @@
* * * *
***************************************************************/ ***************************************************************/
#include "StreamBusInterface.h"
#include "StreamError.h"
#include "StreamBuffer.h"
#include "asynDriver.h"
#include "asynOctet.h"
#include "asynInt32.h"
#include "asynUInt32Digital.h"
#include "asynGpibDriver.h"
#include "devStream.h"
#ifdef EPICS_3_13 #ifdef EPICS_3_13
#include <assert.h> #include <assert.h>
#include <wdLib.h> #include <wdLib.h>
@ -43,6 +31,18 @@ extern "C" {
#include "iocsh.h" #include "iocsh.h"
#endif #endif
#include "StreamBusInterface.h"
#include "StreamError.h"
#include "StreamBuffer.h"
#include "asynDriver.h"
#include "asynOctet.h"
#include "asynInt32.h"
#include "asynUInt32Digital.h"
#include "asynGpibDriver.h"
#include "devStream.h"
#include "MacroMagic.h" #include "MacroMagic.h"
#define Z PRINTF_SIZE_T_PREFIX #define Z PRINTF_SIZE_T_PREFIX

5
src/StreamError.cc
View File

@ -27,12 +27,7 @@
int streamDebug = 0; int streamDebug = 0;
int streamError = 1; int streamError = 1;
extern "C" {
#ifdef _WIN32
__declspec(dllexport)
#endif
FILE *StreamDebugFile = NULL; FILE *StreamDebugFile = NULL;
}
#ifndef va_copy #ifndef va_copy
#ifdef __va_copy #ifdef __va_copy

5
src/devStream.h
View File

@ -88,8 +88,7 @@ typedef const struct format_s {
const struct StreamFormat* priv; const struct StreamFormat* priv;
} format_t; } format_t;
epicsShareExtern FILE* StreamDebugFile; extern FILE* StreamDebugFile;
extern const char StreamVersion [];
typedef long (*streamIoFunction) (dbCommon*, format_t*); typedef long (*streamIoFunction) (dbCommon*, format_t*);
@ -97,6 +96,8 @@ typedef long (*streamIoFunction) (dbCommon*, format_t*);
extern "C" { extern "C" {
#endif #endif
extern const char StreamVersion [];
long streamInit(int after); long streamInit(int after);
long streamInitRecord(dbCommon *record, long streamInitRecord(dbCommon *record,
const struct link *ioLink, const struct link *ioLink,