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/asynnet.c
+++ b/asynnet.c
@ -238,7 +238,7 @@ int ANETconnect(char *name, int iPort)
  } else {
 	  /* check for aaa.bbbb.ccc.dddd */
 	  addr.s_addr = inet_addr(name);
-	  if(addr.s_addr == (unsigned long) -1) {
+	  if(addr.s_addr == (unsigned int) -1) {
 	      anetLog(ANETERROR, "Failed to locate host: %s", name);
 	      return ANETOPENFAIL;
 	  }