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

put extern "C" around all epicsExport* to increase happyness of Windows

Browse Source
This commit is contained in:
zimoch
2018-06-13 10:44:14 +02:00
parent cd5811f59d
commit 9d1084cdf8
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/StreamEpics.cc
View File

@ -73,13 +73,13 @@ extern "C" epicsShareFunc int epicsShareAPI iocshCmd(const char *command);
#endif // !EPICS_3_13 #endif // !EPICS_3_13
#include "devStream.h"
#if defined(__vxworks) || defined(vxWorks) #if defined(__vxworks) || defined(vxWorks)
#include <symLib.h> #include <symLib.h>
#include <sysSymTbl.h> #include <sysSymTbl.h>
#endif #endif
#include "devStream.h"
#define Z PRINTF_SIZE_T_PREFIX #define Z PRINTF_SIZE_T_PREFIX
enum MoreFlags { enum MoreFlags {
@ -179,8 +179,10 @@ public:
// shell functions /////////////////////////////////////////////////////// // shell functions ///////////////////////////////////////////////////////
extern "C" { // needed for Windows
epicsExportAddress(int, streamDebug); epicsExportAddress(int, streamDebug);
epicsExportAddress(int, streamError); epicsExportAddress(int, streamError);
}
// for subroutine record // for subroutine record
long streamReloadSub() long streamReloadSub()
@ -271,7 +273,9 @@ static void streamRegistrar ()
(REGISTRYFUNCTION)streamReloadSub); (REGISTRYFUNCTION)streamReloadSub);
} }
extern "C" {
epicsExportRegistrar(streamRegistrar); epicsExportRegistrar(streamRegistrar);
}
#endif // !EPICS_3_13 #endif // !EPICS_3_13
// driver support //////////////////////////////////////////////////////// // driver support ////////////////////////////////////////////////////////
@ -281,7 +285,9 @@ struct drvet stream = {
(DRVSUPFUN) Stream::report, (DRVSUPFUN) Stream::report,
(DRVSUPFUN) Stream::drvInit (DRVSUPFUN) Stream::drvInit
}; };
extern "C" {
epicsExportAddress(drvet, stream); epicsExportAddress(drvet, stream);
}
#ifdef EPICS_3_13 #ifdef EPICS_3_13
void streamEpicsPrintTimestamp(char* buffer, size_t size) void streamEpicsPrintTimestamp(char* buffer, size_t size)