Merge branch 'maverick' into develop

Compile under OSX
2016-01-26 09:48:11 +01:00
parent f0021db2ff cdb9a8fba2
commit 5e597e2d10
46 changed files with 174 additions and 194 deletions
--- a/network.c
+++ b/network.c
@ -98,7 +98,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 */
      }
    }