Merge remote-tracking branch 'launchpad/3.14'

* launchpad/3.14: missing include Conflicts: src/ioc/dbStatic/dbStaticLib.c
2017-05-02 18:38:40 -04:00
parent 8c8604c503 38be82a154
commit 875e4db3f9
1 changed files with 1 additions and 0 deletions
--- a/src/ioc/dbStatic/dbStaticLib.c
+++ b/src/ioc/dbStatic/dbStaticLib.c
@@ -17,6 +17,7 @@

 #include "cantProceed.h"
 #include "cvtFast.h"
+#include "epicsAssert.h"
 #include "dbDefs.h"
 #include "dbmf.h"
 #include "ellLib.h"