Merge 3.16 (after 3.16.2-rc1) into 7.0

2018-10-26 17:04:53 -05:00
parent c08b1ef5d1 94ebd0fe48
commit 2efe56c6d1
157 changed files with 5520 additions and 1623 deletions
@@ -193,7 +193,7 @@ udpiiu::udpiiu (

 #ifdef IP_MULTICAST_TTL
    {
-        int ttl;
+        osiSockOptMcastTTL_t ttl;
        long val;
        if(envGetLongConfigParam(&EPICS_CA_MCAST_TTL, &val))
            val =1;