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

Merge branch '7.0' release 7.4.0.1 into PSI-7.0

Browse Source 
Conflicts:
	.gitmodules
	modules/database/src/ioc/db/Makefile
	modules/libcom/test/epicsAtomicTest.cpp
	modules/pvAccess
	modules/pvData
	modules/pvDatabase
	modules/pva2pva
This commit is contained in:
zimoch
2020-06-02 14:55:30 +02:00
parent b27d1416b5 1fec685eed
commit 88cdffddb6
868 changed files with 33281 additions and 27367 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/database/test/ioc/db/callbackParallelTest.c
+1 -1
View File
@@ -5,7 +5,7 @@
* Operator of Los Alamos National Laboratory.
* Copyright (c) 2013 ITER Organization.
* EPICS BASE is distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* Author: Marty Kraimer Date: 26JAN2000 */
modules/database/test/ioc/db/callbackTest.c
+2 -2
View File
@@ -5,7 +5,7 @@
* Operator of Los Alamos National Laboratory.
* Copyright (c) 2013 ITER Organization.
* EPICS BASE is distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* Author: Marty Kraimer Date: 26JAN2000 */
@@ -61,7 +61,7 @@ static void myCallback(epicsCallback *pCallback)
myPvt *pmyPvt;
callbackGetUser(pmyPvt, pCallback);
pmyPvt->pass++;
if (pmyPvt->pass == 1) {
modules/database/test/ioc/db/dbCaLinkTest.c
+1 -1
View File
@@ -32,7 +32,7 @@ typedef void * chid;
typedef void * evid;
epicsShareExtern const unsigned short dbr_value_size[];
epicsShareExtern short epicsShareAPI ca_field_type (chid chan);
#define MAX_UNITS_SIZE 8
#define MAX_UNITS_SIZE 8
#include "dbCaPvt.h"
#include "errlog.h"
modules/database/test/ioc/db/dbPutLinkTest.c
+1 -1
View File
@@ -459,7 +459,7 @@ static void testLinkInitFail(void)
eltc(0);
testOk(dbReadDatabase(&pdbbase, "dbBadLink.db", "." OSI_PATH_LIST_SEPARATOR
".." OSI_PATH_LIST_SEPARATOR "../O.Common" OSI_PATH_LIST_SEPARATOR
"O.Common", NULL) != 0, "dbReadDatabase returned error (expected)");
"O.Common", NULL) != 0, "dbReadDatabase returned error (expected)");
testIocInitOk();
eltc(1);
modules/database/test/ioc/db/xRecord.c
+2
View File
@@ -13,6 +13,8 @@
* Ralph Lange <Ralph.Lange@bessy.de>
*/
#include <string.h>
#include "dbAccessDefs.h"
#include "recSup.h"
#include "recGbl.h"