From 9d1084cdf8f719a4744bbaa3086cbe8f40a30109 Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Wed, 13 Jun 2018 10:44:14 +0200 Subject: [PATCH] put extern "C" around all epicsExport* to increase happyness of Windows --- src/StreamEpics.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/StreamEpics.cc b/src/StreamEpics.cc index 9ad072e..b3ebbfe 100644 --- a/src/StreamEpics.cc +++ b/src/StreamEpics.cc @@ -73,13 +73,13 @@ extern "C" epicsShareFunc int epicsShareAPI iocshCmd(const char *command); #endif // !EPICS_3_13 -#include "devStream.h" - #if defined(__vxworks) || defined(vxWorks) #include #include #endif +#include "devStream.h" + #define Z PRINTF_SIZE_T_PREFIX enum MoreFlags { @@ -179,8 +179,10 @@ public: // shell functions /////////////////////////////////////////////////////// +extern "C" { // needed for Windows epicsExportAddress(int, streamDebug); epicsExportAddress(int, streamError); +} // for subroutine record long streamReloadSub() @@ -271,7 +273,9 @@ static void streamRegistrar () (REGISTRYFUNCTION)streamReloadSub); } +extern "C" { epicsExportRegistrar(streamRegistrar); +} #endif // !EPICS_3_13 // driver support //////////////////////////////////////////////////////// @@ -281,7 +285,9 @@ struct drvet stream = { (DRVSUPFUN) Stream::report, (DRVSUPFUN) Stream::drvInit }; +extern "C" { epicsExportAddress(drvet, stream); +} #ifdef EPICS_3_13 void streamEpicsPrintTimestamp(char* buffer, size_t size)