gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-06-01 09:02:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix a few remaining mingw32isms

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@22001 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2005-11-14 09:28:37 +00:00
parent 44d19385ed
commit f94cee1583
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Source/GSFileHandle.m
View file

@ -661,7 +661,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
static NSString *esocks = nil; static NSString *esocks = nil;
static NSString *dsocks = nil; static NSString *dsocks = nil;
static BOOL beenHere = NO; static BOOL beenHere = NO;
SOCKET net; int net;
struct sockaddr_in sin; struct sockaddr_in sin;
struct sockaddr_in lsin; struct sockaddr_in lsin;
NSString *lhost = nil; NSString *lhost = nil;
@ -794,7 +794,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
} }
} }
if ((net = socket(AF_INET, SOCK_STREAM, PF_UNSPEC)) == INVALID_SOCKET) if ((net = socket(AF_INET, SOCK_STREAM, PF_UNSPEC)) == -1)
{ {
NSLog(@"unable to create socket - %s", GSLastErrorStr(errno)); NSLog(@"unable to create socket - %s", GSLastErrorStr(errno));
RELEASE(self); RELEASE(self);
@ -808,7 +808,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
if (lhost != nil) if (lhost != nil)
{ {
if (bind(net, (struct sockaddr *)&lsin, sizeof(lsin)) == SOCKET_ERROR) if (bind(net, (struct sockaddr *)&lsin, sizeof(lsin)) == -1)
{ {
NSLog(@"unable to bind to port %s:%d - %s", inet_ntoa(lsin.sin_addr), NSLog(@"unable to bind to port %s:%d - %s", inet_ntoa(lsin.sin_addr),
GSSwapBigI16ToHost(sin.sin_port), GSLastErrorStr(errno)); GSSwapBigI16ToHost(sin.sin_port), GSLastErrorStr(errno));
@ -825,7 +825,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
isSocket = YES; isSocket = YES;
[self setNonBlocking: YES]; [self setNonBlocking: YES];
if (connect(net, (struct sockaddr*)&sin, sizeof(sin)) == SOCKET_ERROR) if (connect(net, (struct sockaddr*)&sin, sizeof(sin)) == -1)
{ {
if (errno != EINPROGRESS) if (errno != EINPROGRESS)
{ {
@ -882,7 +882,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
#ifndef BROKEN_SO_REUSEADDR #ifndef BROKEN_SO_REUSEADDR
int status = 1; int status = 1;
#endif #endif
SOCKET net; int net;
struct sockaddr_in sin; struct sockaddr_in sin;
unsigned int size = sizeof(sin); unsigned int size = sizeof(sin);
@ -893,7 +893,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
return nil; return nil;
} }
if ((net = socket(AF_INET, SOCK_STREAM, PF_UNSPEC)) == INVALID_SOCKET) if ((net = socket(AF_INET, SOCK_STREAM, PF_UNSPEC)) == -1)
{ {
NSLog(@"unable to create socket - %s", GSLastErrorStr(errno)); NSLog(@"unable to create socket - %s", GSLastErrorStr(errno));
RELEASE(self); RELEASE(self);
@ -910,7 +910,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
setsockopt(net, SOL_SOCKET, SO_REUSEADDR, (char *)&status, sizeof(status)); setsockopt(net, SOL_SOCKET, SO_REUSEADDR, (char *)&status, sizeof(status));
#endif #endif
if (bind(net, (struct sockaddr *)&sin, sizeof(sin)) == SOCKET_ERROR) if (bind(net, (struct sockaddr *)&sin, sizeof(sin)) == -1)
{ {
NSLog(@"unable to bind to port %s:%d - %s", inet_ntoa(sin.sin_addr), NSLog(@"unable to bind to port %s:%d - %s", inet_ntoa(sin.sin_addr),
GSSwapBigI16ToHost(sin.sin_port), GSLastErrorStr(errno)); GSSwapBigI16ToHost(sin.sin_port), GSLastErrorStr(errno));
@ -919,7 +919,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
return nil; return nil;
} }
if (listen(net, 256) == SOCKET_ERROR) if (listen(net, 256) == -1)
{ {
NSLog(@"unable to listen on port - %s", GSLastErrorStr(errno)); NSLog(@"unable to listen on port - %s", GSLastErrorStr(errno));
(void) close(net); (void) close(net);
@ -927,7 +927,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
return nil; return nil;
} }
if (getsockname(net, (struct sockaddr*)&sin, &size) == SOCKET_ERROR) if (getsockname(net, (struct sockaddr*)&sin, &size) == -1)
{ {
NSLog(@"unable to get socket name - %s", GSLastErrorStr(errno)); NSLog(@"unable to get socket name - %s", GSLastErrorStr(errno));
(void) close(net); (void) close(net);
@ -1889,7 +1889,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
unsigned int blen = sizeof(buf); unsigned int blen = sizeof(buf);
desc = accept(descriptor, (struct sockaddr*)&buf, &blen); desc = accept(descriptor, (struct sockaddr*)&buf, &blen);
if (desc == INVALID_SOCKET) if (desc == -1)
{ {
NSString *s; NSString *s;
@ -2141,7 +2141,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
struct sockaddr_in sin; struct sockaddr_in sin;
unsigned size = sizeof(sin); unsigned size = sizeof(sin);
if (getsockname(descriptor, (struct sockaddr*)&sin, &size) == SOCKET_ERROR) if (getsockname(descriptor, (struct sockaddr*)&sin, &size) == -1)
{ {
NSLog(@"unable to get socket name - %s", GSLastErrorStr(errno)); NSLog(@"unable to get socket name - %s", GSLastErrorStr(errno));
} }
@ -2158,7 +2158,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
struct sockaddr_in sin; struct sockaddr_in sin;
unsigned size = sizeof(sin); unsigned size = sizeof(sin);
if (getsockname(descriptor, (struct sockaddr*)&sin, &size) == SOCKET_ERROR) if (getsockname(descriptor, (struct sockaddr*)&sin, &size) == -1)
{ {
NSLog(@"unable to get socket name - %s", GSLastErrorStr(errno)); NSLog(@"unable to get socket name - %s", GSLastErrorStr(errno));
} }