Merge ~info-martin-konrad/epics-base:fix-crash-dbloadrecords-after-iocinit into ~epics-core/epics-base/+git/epics-base:3.15
Proposed by
Martin Konrad
Status: | Merged |
---|---|
Merge reported by: | mdavidsaver |
Merged at revision: | a50b850ebdb4ef7ebb2906e090513bc618085a18 |
Proposed branch: | ~info-martin-konrad/epics-base:fix-crash-dbloadrecords-after-iocinit |
Merge into: | ~epics-core/epics-base/+git/epics-base:3.15 |
Diff against target: |
95 lines (+27/-6) 4 files modified
src/ioc/db/dbAccess.c (+12/-3) src/ioc/dbStatic/dbLexRoutines.c (+4/-0) src/ioc/misc/iocInit.c (+6/-3) src/ioc/misc/iocInit.h (+5/-0) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andrew Johnson | Approve | ||
Review via email: mp+375559@code.launchpad.net |
To post a comment you must log in.
One adjustment needed in dbLexRoutines.c, please move the #include "iocInit.h" below the definition of epicsExportShar edSymbols since the two object files are built into the same library. That fixes my mingw cross-build.
Builds fine on VxWorks back to 5.5.2 (which doesn't have stdbool.h but you took that out again).