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 for bug #39126

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@36686 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2013-05-31 09:28:14 +00:00
parent 7358c7d942
commit dd840e5838
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,4 +1,13 @@
2013-05-31 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSLock.m: ([-lockWhenCondition:beforeDate:])
Lock mutex using -lockBeforeDate: so that we can abandon the wait
for the condition at the spacified date in the case where we can't
even obtain a lock before that date.
Fix for bug #39126
2013-05-29 Sebastian Reitenbach <sebastia@l00-bugdead-prods.de> 2013-05-29 Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
* Headers/Foundation/NSString.h * Headers/Foundation/NSString.h
make NSStringEncoding enum typdef to NSUInteger make NSStringEncoding enum typdef to NSUInteger
* Source/Additions/Unicode.m * Source/Additions/Unicode.m

5
Source/NSLock.m
View file

@ -404,7 +404,10 @@ MUNLOCK
- (BOOL) lockWhenCondition: (NSInteger)condition_to_meet - (BOOL) lockWhenCondition: (NSInteger)condition_to_meet
beforeDate: (NSDate*)limitDate beforeDate: (NSDate*)limitDate
{ {
[_condition lock]; if (NO == [_condition lockBeforeDate: limitDate])
{
return NO;
}
if (condition_to_meet == _condition_value) if (condition_to_meet == _condition_value)
{ {
return YES; return YES;