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

minor mingw32 fixups

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@22616 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2006-03-08 06:25:44 +00:00
parent 37fdb1f4f7
commit 172bfc67ef
3 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2006-03-08 Richard Frith-Macdonald <rfm@gnu.org>
* Source/unix/GSRunLoopCtxt.m: Don't hanlde windows messages unless
required.
* Source/win32/NSStreamWin32.m: Use fileSystemRepresentation rather
than cStringUsingEncoding:
2006-03-07 Richard Frith-Macdonald <rfm@gnu.org> 2006-03-07 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSRunLoop.m: * Source/NSRunLoop.m:

19
Source/win32/GSRunLoopCtxt.m
View file

@ -380,8 +380,23 @@ static const NSMapTableValueCallBacks WatcherMapValueCallBacks =
wait_timeout = 0; // Processed something ... no need to wait. wait_timeout = 0; // Processed something ... no need to wait.
} }
wait_return = MsgWaitForMultipleObjects(num_handles, handleArray, if (num_winMsgs > 0)
NO, wait_timeout, QS_ALLINPUT); {
/*
* Wait for signalled events or window messages.
*/
wait_return = MsgWaitForMultipleObjects(num_handles, handleArray,
NO, wait_timeout, QS_ALLINPUT);
}
else
{
/*
* We are not interested in windows messages ... just wait for
* signalled events.
*/
wait_return = WaitForMultipleObjects(num_handles, handleArray,
NO, wait_timeout);
}
NSDebugMLLog(@"NSRunLoop", @"wait returned %d", wait_return); NSDebugMLLog(@"NSRunLoop", @"wait returned %d", wait_return);
// if there are windows message // if there are windows message

6
Source/win32/NSStreamWin32.m
View file

@ -295,8 +295,7 @@ static void setNonblocking(SOCKET fd)
{ {
int fd; int fd;
fd = _wopen((unichar*)[_path cStringUsingEncoding: NSUnicodeStringEncoding], fd = _wopen([_path fileSystemRepresentation], O_RDONLY|O_BINARY);
O_RDONLY|O_BINARY);
if (fd < 0) if (fd < 0)
{ {
[self _recordError]; [self _recordError];
@ -790,8 +789,7 @@ static void setNonblocking(SOCKET fd)
flag = flag | O_APPEND; flag = flag | O_APPEND;
else else
flag = flag | O_TRUNC; flag = flag | O_TRUNC;
fd = _wopen((unichar*)[_path cStringUsingEncoding: NSUnicodeStringEncoding], fd = _wopen([_path fileSystemRepresentation], flag, mode);
flag, mode);
if (fd < 0) if (fd < 0)
{ // make an error { // make an error
[self _recordError]; [self _recordError];