gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 00:11:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

portability tweak

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@32290 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2011-02-22 11:55:37 +00:00
parent 38670c0a08
commit e6fca186b1
5 changed files with 33 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Source/NSLocale.m
View file

@ -114,7 +114,8 @@ NSString * const NSISO8601Calendar = @"";
static const char * ICUCalendarKeyword = "calendar";
static const char * ICUCollationKeyword = "collation";
static NSLocaleLanguageDirection _ICUToNSLocaleOrientation (ULayoutType layout)
static NSLocaleLanguageDirection
ICUToNSLocaleOrientation (ULayoutType layout)
{
switch (layout)
{
@ -340,7 +341,7 @@ static NSRecursiveLock *classLock = nil;
if (U_FAILURE(status) || ULOC_LAYOUT_UNKNOWN == result)
return NSLocaleLanguageDirectionUnknown;
return _ICUToNSLocaleOrientation (result);
return ICUToNSLocaleOrientation (result);
#else
return NSLocaleLanguageDirectionLeftToRight; // FIXME
#endif
@ -530,7 +531,7 @@ static NSRecursiveLock *classLock = nil;
if (U_FAILURE(status) || ULOC_LAYOUT_UNKNOWN == result)
return NSLocaleLanguageDirectionUnknown;
return _ICUToNSLocaleOrientation (result);
return ICUToNSLocaleOrientation (result);
#else
return NSLocaleLanguageDirectionTopToBottom; // FIXME
#endif
@ -597,10 +598,10 @@ static NSRecursiveLock *classLock = nil;
// A locale cannot be constructed without a language.
if (language == NULL)
return nil;
#define __TEST_CODE(x) (x ? "_" : ""), (x ? x : "")
#define TEST_CODE(x) (x ? "_" : ""), (x ? x : "")
string = [[NSMutableString alloc] initWithFormat: @"%s%s%s%s%s%s%s",
language, __TEST_CODE(script), __TEST_CODE(country), __TEST_CODE(variant)];
#undef __TEST_CODE
language, TEST_CODE(script), TEST_CODE(country), TEST_CODE(variant)];
#undef TEST_CODE
// I'm not using uloc_setKeywordValue() here because the format is easy
// enough to reproduce and has the added advatange that we doesn't need ICU.