EPICS_base/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merge 3.15 branch into 3.16

Browse Source
This commit is contained in:
Andrew Johnson
2018-02-01 15:05:44 -06:00
parent 506be838af af07016464
commit eef6f3afbb
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure/os/CONFIG.win32-x86.win32-x86
View File

@ -136,6 +136,16 @@ STATIC_LDLIBS_NO=
STATIC_LDFLAGS=
RANLIB=
#
# option needed for parallel builds with Visual Studio 2015 onward
#
# -FS Force Synchronous PDB Writes
ifneq ($(VisualStudioVersion),)
OPT_CXXFLAGS_NO += -FS
OPT_CFLAGS_NO += -FS
endif
#
# add -profile here to run the ms profiler
# -LTCG whole program optimization

9
src/ioc/rsrv/online_notify.c
View File

@ -45,7 +45,6 @@ void rsrv_online_notify_task(void *pParm)
caHdr msg;
int status;
ca_uint32_t beaconCounter = 0;
char buf[16];
taskwdInsert (epicsThreadGetIdSelf(),NULL,NULL);
@ -85,10 +84,12 @@ void rsrv_online_notify_task(void *pParm)
&pAddr->addr.sa, sizeof(pAddr->addr));
if (status < 0) {
char sockErrBuf[64];
epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) );
ipAddrToDottedIP (&pAddr->addr.ia, buf, sizeof(buf));
char sockDipBuf[22];
epicsSocketConvertErrnoToString(sockErrBuf, sizeof(sockErrBuf));
ipAddrToDottedIP(&pAddr->addr.ia, sockDipBuf, sizeof(sockDipBuf));
errlogPrintf ( "CAS: CA beacon send to %s error: %s\n",
buf, sockErrBuf);
sockDipBuf, sockErrBuf);
}
else {
assert (status == sizeof(msg));