Merge changes from 3.15 branch into 3.16

2017-10-27 12:32:14 -05:00
parent 48ea653ba9 e38252eecc
commit 05d4d7431e
19 changed files with 113 additions and 26 deletions
@@ -180,7 +180,7 @@ udpiiu::udpiiu (

 #ifdef IP_ADD_MEMBERSHIP
    {
-        int flag = 1;
+        osiSockOptMcastLoop_t flag = 1;
        if ( setsockopt ( this->sock, IPPROTO_IP, IP_MULTICAST_LOOP,
                          (char *) &flag, sizeof ( flag ) ) == -1 ) {
            char sockErrBuf[64];