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

msys2 64bit tweaks

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@39931 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2016-06-27 18:04:30 +00:00
parent 2dbc4d0d20
commit 066fb2558a
4 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/GSLocale.m
View file

@ -319,10 +319,12 @@ GSLanguagesFromLocale(NSString *locale)
NSString *GSDefaultLanguageLocale() NSString *GSDefaultLanguageLocale()
{ {
NSString *backup, *locale = nil; NSString *locale = nil;
#ifdef HAVE_LOCALE_H #ifdef HAVE_LOCALE_H
#ifdef LC_MESSAGES #ifdef LC_MESSAGES
NSString *backup;
[gnustep_global_lock lock]; [gnustep_global_lock lock];
backup = privateSetLocale(LC_ALL, nil); backup = privateSetLocale(LC_ALL, nil);

4
Source/GSNetwork.h
View file

@ -40,6 +40,10 @@
#if defined(_WIN32) #if defined(_WIN32)
#if defined(__WIN64__)
#include <winsock2.h>
#endif
#include <io.h> #include <io.h>
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>

26
Source/win32/GSFileHandle.m
View file

@ -22,9 +22,14 @@
Boston, MA 02111 USA. Boston, MA 02111 USA.
*/ */
/* mingw wants winsock2.h before windows.h */ #if defined(__WIN64__)
#include <winsock2.h>
#include <windows.h>
#else
/* mingw32 wants winsock2.h before windows.h */
#include <windows.h> #include <windows.h>
#include <winsock2.h> #include <winsock2.h>
#endif
#include "common.h" #include "common.h"
@ -789,7 +794,8 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
NSLog(@"bad address-service-protocol combination"); NSLog(@"bad address-service-protocol combination");
return nil; return nil;
} }
[self setAddr: &sin]; // Store the address of the remote end. // Store the address of the remote end.
[self setAddr: (struct sockaddr *)&sin];
/* /*
* Don't use SOCKS if we are contacting the local host. * Don't use SOCKS if we are contacting the local host.
@ -963,7 +969,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
acceptOK = YES; acceptOK = YES;
readOK = NO; readOK = NO;
writeOK = NO; writeOK = NO;
[self setAddr: &sin]; [self setAddr: (struct sockaddr *)&sin];
} }
return self; return self;
} }
@ -1746,13 +1752,11 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
NSMutableDictionary *info = readInfo; NSMutableDictionary *info = readInfo;
NSNotification *n; NSNotification *n;
NSNotificationCenter *q; NSNotificationCenter *q;
NSArray *modes;
NSString *name; NSString *name;
[self ignoreReadDescriptor]; [self ignoreReadDescriptor];
readInfo = nil; readInfo = nil;
readMax = 0; readMax = 0;
modes = (NSArray*)[info objectForKey: NSFileHandleNotificationMonitorModes];
name = (NSString*)[info objectForKey: NotificationKey]; name = (NSString*)[info objectForKey: NotificationKey];
if (name == nil) if (name == nil)
@ -1772,11 +1776,9 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
NSMutableDictionary *info = [writeInfo objectAtIndex: 0]; NSMutableDictionary *info = [writeInfo objectAtIndex: 0];
NSNotificationCenter *q; NSNotificationCenter *q;
NSNotification *n; NSNotification *n;
NSArray *modes;
NSString *name; NSString *name;
[self ignoreWriteDescriptor]; [self ignoreWriteDescriptor];
modes = (NSArray*)[info objectForKey: NSFileHandleNotificationMonitorModes];
name = (NSString*)[info objectForKey: NotificationKey]; name = (NSString*)[info objectForKey: NotificationKey];
n = [NSNotification notificationWithName: name object: self userInfo: info]; n = [NSNotification notificationWithName: name object: self userInfo: info];
@ -2055,7 +2057,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
closeOnDealloc: YES]; closeOnDealloc: YES];
h->isSocket = YES; h->isSocket = YES;
getpeername(desc, (struct sockaddr*)&sin, &size); getpeername(desc, (struct sockaddr*)&sin, &size);
[h setAddr: &sin]; [h setAddr: (struct sockaddr *)&sin];
[readInfo setObject: h [readInfo setObject: h
forKey: NSFileHandleNotificationFileHandleItem]; forKey: NSFileHandleNotificationFileHandleItem];
RELEASE(h); RELEASE(h);
@ -2356,12 +2358,14 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
return nil; /* Don't restart timed out events */ return nil; /* Don't restart timed out events */
} }
- (void) setAddr: (struct sockaddr_in *)sin - (void) setAddr: (struct sockaddr *)sin
{ {
struct sockaddr_in *s = (struct sockaddr_in *)sin;
address = [[NSString alloc] initWithUTF8String: address = [[NSString alloc] initWithUTF8String:
(char*)inet_ntoa(sin->sin_addr)]; (char*)inet_ntoa(s->sin_addr)];
service = [[NSString alloc] initWithFormat: @"%d", service = [[NSString alloc] initWithFormat: @"%d",
(int)GSSwapBigI16ToHost(sin->sin_port)]; (int)GSSwapBigI16ToHost(s->sin_port)];
protocol = @"tcp"; protocol = @"tcp";
} }

3
Source/win32/NSMessagePortNameServer.m
View file

@ -377,11 +377,10 @@ OutputDebugStringW(L"");
- (BOOL) removePortForName: (NSString *)name - (BOOL) removePortForName: (NSString *)name
{ {
NSString *n; NSString *n;
int rc;
NSDebugLLog(@"NSMessagePortNameServer", @"removePortForName: %@", name); NSDebugLLog(@"NSMessagePortNameServer", @"removePortForName: %@", name);
n = [[self class] _translate: name]; n = [[self class] _translate: name];
rc = RegDeleteValueW(key, UNISTR(n)); (void)RegDeleteValueW(key, UNISTR(n));
return YES; return YES;
} }