Merged changes from 3.14 branch

Up to 3.14.12.4 release.
2013-12-17 12:54:04 -06:00
parent 25f70a1bd7 3009091875
commit 0a2020e2fc
84 changed files with 986 additions and 594 deletions
--- a/src/ca/client/iocinf.cpp
+++ b/src/ca/client/iocinf.cpp
@@ -22,12 +22,12 @@

 #include <ctype.h>
 #include <string.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>

 #include "envDefs.h"
 #include "epicsAssert.h"
+#include "epicsStdioRedirect.h"
 #include "errlog.h"
 #include "osiWireFormat.h"