Merged changes from 3.15 branch up to Revno 12686

src/ioc/dbStatic/dbStaticLib.c

@@ -49,7 +49,7 @@
 
 int dbStaticDebug = 0;
 static char *pNullString = "";
-#define messagesize	100
+#define messagesize	276
 #define RPCL_LEN INFIX_TO_POSTFIX_SIZE(80)
 
 static char *ppstring[5]={"NPP","PP","CA","CP","CPP"};

src/libCom/osi/os/cygwin32/osdSock.h

@@ -19,6 +19,7 @@
 #include <sys/types.h>
 #include <sys/param.h> /* for MAXHOSTNAMELEN */
 #include <sys/ioctl.h>
+#include <sys/select.h>
 #include <sys/time.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

src/libCom/osi/os/cygwin32/systemCallIntMech.cpp

@@ -19,7 +19,7 @@
 enum epicsSocketSystemCallInterruptMechanismQueryInfo 
         epicsSocketSystemCallInterruptMechanismQuery ()
 {
-#if (CYGWIN_VERSION_DLL_MAJOR >= 1007) && (CYGWIN_VERSION_DLL_MINOR < 15)
+#if (CYGWIN_VERSION_DLL_MAJOR == 1007) && (CYGWIN_VERSION_DLL_MINOR < 15)
     // Behaviour changed in early Cygwin 1.7 releases, reverted later.
     return esscimqi_socketCloseRequired;
 #else