From 4f1b24458967f453a172ee025623531c4caf23a9 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Thu, 20 Apr 2017 09:54:05 -0400 Subject: [PATCH] ca: fix export caLimitArray on win32 --- src/ca/client/cac.cpp | 3 +++ src/ioc/rsrv/caservertask.c | 9 ++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/ca/client/cac.cpp b/src/ca/client/cac.cpp index d13b5766c..c174b8992 100644 --- a/src/ca/client/cac.cpp +++ b/src/ca/client/cac.cpp @@ -32,6 +32,7 @@ #include "envDefs.h" #include "locationException.h" #include "errlog.h" +#include "epicsExport.h" #define epicsExportSharedSymbols #include "addrList.h" @@ -57,7 +58,9 @@ static const char pVersionCAC[] = // when set, respect EPICS_CA_MAX_ARRAY_BYTES // when clear, ignore it extern "C" { +epicsShareExtern int caLimitArray; int caLimitArray; +epicsExportAddress(int, caLimitArray); } // TCP response dispatch table diff --git a/src/ioc/rsrv/caservertask.c b/src/ioc/rsrv/caservertask.c index 53f4a32d9..3766d421d 100644 --- a/src/ioc/rsrv/caservertask.c +++ b/src/ioc/rsrv/caservertask.c @@ -33,6 +33,10 @@ #include "osiSock.h" #include "taskwd.h" #include "cantProceed.h" + +// defined in cac.cpp +epicsShareExtern int caLimitArray; + #include "epicsExport.h" #define epicsExportSharedSymbols @@ -48,11 +52,6 @@ epicsThreadPrivateId rsrvCurrentClient; -// defined in cac.cpp -extern int caLimitArray; - -epicsExportAddress(int, caLimitArray); - /* * * req_server()