Author: rfm
Date: Mon Jun 27 21:31:02 2016
New Revision: 39934
URL: http://svn.gna.org/viewcvs/gnustep?rev=39934&view=rev
Log:
more msys2/64bit tweaks
Modified:
libs/base/trunk/Source/NSSocketPort.m
libs/base/trunk/Source/win32/NSUserDefaults.m
Modified: libs/base/trunk/Source/NSSocketPort.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSSocketPort.m?rev=39934&r1=39933&r2=39934&view=diff
==============================================================================
--- libs/base/trunk/Source/NSSocketPort.m (original)
+++ libs/base/trunk/Source/NSSocketPort.m Mon Jun 27 21:31:02 2016
@@ -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 @@
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 @@
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 @@
* 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 @@
(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 @@
*/
if (eventListener != WSA_INVALID_EVENT)
{
- *count++;
+ (*count)++;
if (pos < limit)
{
fds[pos++] = (uintptr_t)eventListener;
@@ -1985,7 +1989,7 @@
* 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 @@
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 @@
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);
Modified: libs/base/trunk/Source/win32/NSUserDefaults.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/win32/NSUserDefaults.m?rev=39934&r1=39933&r2=39934&view=diff
==============================================================================
--- libs/base/trunk/Source/win32/NSUserDefaults.m (original)
+++ libs/base/trunk/Source/win32/NSUserDefaults.m Mon Jun 27 21:31:02 2016
@@ -15,6 +15,10 @@
((const unichar*)[(X) cStringUsingEncoding: NSUnicodeStringEncoding])
extern void GSPropertyListMake(id,NSDictionary*,BOOL,BOOL,unsigned,id*);
+
+@interface NSUserDefaults (Private)
+- (id) initWithContentsOfFile: (NSString*)fielName;
+@end
@interface NSUserDefaultsWin32 : NSUserDefaults
{
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
