linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'maverick' into develop

Browse Source 
Compile under OSX
This commit is contained in:
koennecke
2016-01-26 09:48:11 +01:00
parent f0021db2ff cdb9a8fba2
commit 5e597e2d10
46 changed files with 174 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ascon.c
View File

@ -40,7 +40,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 */
}
}
@ -73,7 +73,7 @@ void AsconError(Ascon *a, char *msg, int errorno)
char *state;
char num[8];
if (a->state < 0 || a->state >= AsconMaxState) {
if ( a->state >= AsconMaxState) {
state = "bad state";
} else {
state = stateText[a->state];