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

more msys2/64bit tweaks

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@39934 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2016-06-27 19:31:02 +00:00
parent 9592363863
commit 7f0fc86fc7
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Source/NSSocketPort.m
View file

@ -51,12 +51,15 @@
#ifdef _WIN32
#define close closesocket
#define OPTLEN int
#else
#define OPTLEN socklen_t
#include <sys/param.h> /* for MAXHOSTNAMELEN */
#include <sys/types.h>
#include <netinet/in.h>
#include <arpa/inet.h> /* for inet_ntoa() */
#endif /* !_WIN32 */
#include <ctype.h> /* for strchr() */
#if defined(HAVE_SYS_FCNTL_H)
@ -659,7 +662,7 @@ static Class runLoopClass;
int status = 1;
setsockopt(desc, SOL_SOCKET, SO_KEEPALIVE, (char*)&status,
sizeof(status));
(OPTLEN)sizeof(status));
addrNum = 0;
caller = YES;
[aPort addHandle: self forSend: YES];
@ -1102,7 +1105,8 @@ static Class runLoopClass;
int res = 0;
socklen_t len = sizeof(res);
if (getsockopt(desc, SOL_SOCKET, SO_ERROR, (char*)&res, &len) != 0)
if (getsockopt(desc, SOL_SOCKET, SO_ERROR, (char*)&res,
(OPTLEN*)&len) != 0)
{
state = GS_H_UNCON;
NSLog(@"connect attempt failed - %@", [NSError _last]);
@ -1640,7 +1644,7 @@ static Class tcpPortClass;
* We don't want that broken behavior!
*/
else if (setsockopt(desc, SOL_SOCKET, SO_REUSEADDR, (char*)&reuse,
sizeof(reuse)) < 0)
(OPTLEN)sizeof(reuse)) < 0)
{
(void) close(desc);
NSLog(@"unable to set reuse on socket - %@",
@ -1662,8 +1666,8 @@ static Class tcpPortClass;
(void) close(desc);
DESTROY(port);
}
else if (getsockname(desc, (struct sockaddr*)&sockaddr, &slen)
== SOCKET_ERROR)
else if (getsockname(desc, (struct sockaddr*)&sockaddr,
(OPTLEN*)&slen) == SOCKET_ERROR)
{
NSLog(@"unable to get socket name - %@", [NSError _last]);
(void) close(desc);
@ -1842,7 +1846,7 @@ static Class tcpPortClass;
*/
if (eventListener != WSA_INVALID_EVENT)
{
*count++;
(*count)++;
if (pos < limit)
{
fds[pos++] = (uintptr_t)eventListener;
@ -1985,7 +1989,7 @@ static Class tcpPortClass;
* We don't want that broken behavior!
*/
else if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char*)&opt,
sizeof(opt)) < 0)
(OPTLEN)sizeof(opt)) < 0)
{
(void)close(sock);
NSLog(@"unable to set reuse on socket - %@", [NSError _last]);
@ -2154,7 +2158,7 @@ static Class tcpPortClass;
struct sockaddr sockAddr;
socklen_t size = sizeof(sockAddr);
desc = accept(listener, (struct sockaddr*)&sockAddr, &size);
desc = accept(listener, (struct sockaddr*)&sockAddr, (OPTLEN*)&size);
if (desc == INVALID_SOCKET)
{
NSDebugMLLog(@"NSPort", @"accept failed - handled in other thread?");
@ -2164,7 +2168,7 @@ static Class tcpPortClass;
int status = 1;
setsockopt(desc, SOL_SOCKET, SO_KEEPALIVE, (char*)&status,
sizeof(status));
(OPTLEN)sizeof(status));
#if defined(_WIN32)
// reset associated event with new socket
WSAEventSelect(desc, eventListener, 0);

4
Source/win32/NSUserDefaults.m
View file

@ -16,6 +16,10 @@
extern void GSPropertyListMake(id,NSDictionary*,BOOL,BOOL,unsigned,id*);
@interface NSUserDefaults (Private)
- (id) initWithContentsOfFile: (NSString*)fielName;
@end
@interface NSUserDefaultsWin32 : NSUserDefaults
{
NSString *registryPrefix;