Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop

Conflicts: fourmess.c
2016-01-29 08:53:00 +01:00
parent a630a30294 5e597e2d10
commit 95988f331c
50 changed files with 183 additions and 201 deletions
@@ -146,7 +146,7 @@ static int CreateSocketAdress(struct sockaddr_in *sockaddrPtr,  /* Socket addres
             (char *) hostent->h_addr_list[0], (size_t) hostent->h_length);
    } else {
      addr.s_addr = inet_addr(host);
-      if (addr.s_addr == (unsigned long) -1) {
+      if (addr.s_addr == (unsigned int) -1) {
        return 0;               /* error */
      }
    }