mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
* Source/Additions/Unicode.m
Headers/Foundation/NSString.h revert my change from 2013-05-29 breaks decoding of .gorm files in NSString for me on amd64 git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@36701 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
f7ce6cfaa5
commit
3fafe05f0c
3 changed files with 11 additions and 5 deletions
|
@ -1,3 +1,10 @@
|
|||
2013-06-06 Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
|
||||
|
||||
* Source/Additions/Unicode.m
|
||||
Headers/Foundation/NSString.h
|
||||
revert my change from 2013-05-29
|
||||
breaks decoding of .gorm files in NSString for me on amd64
|
||||
|
||||
2013-05-31 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Source/NSLock.m: ([-lockWhenCondition:beforeDate:])
|
||||
|
|
|
@ -148,7 +148,7 @@ typedef NSUInteger NSStringCompareOptions;
|
|||
* NSGSM0338StringEncoding, NSBIG5StringEncoding,
|
||||
* NSKoreanEUCStringEncoding</code>.</p>
|
||||
*/
|
||||
enum
|
||||
typedef enum _NSStringEncoding
|
||||
{
|
||||
/* NB. Must not have an encoding with value zero - so we can use zero to
|
||||
tell that a variable that should contain an encoding has not yet been
|
||||
|
@ -204,8 +204,7 @@ enum
|
|||
NSUTF32BigEndianStringEncoding = 0x98000100,
|
||||
NSUTF32LittleEndianStringEncoding = 0x9c000100
|
||||
#endif
|
||||
};
|
||||
typedef NSUInteger NSStringEncoding;
|
||||
} NSStringEncoding;
|
||||
|
||||
enum {
|
||||
NSOpenStepUnicodeReservedBase = 0xF400
|
||||
|
|
|
@ -1350,7 +1350,7 @@ tables:
|
|||
*/
|
||||
if (estr == 0)
|
||||
{
|
||||
NSLog(@"GSToUnicode() No iconv for encoding x%02"PRIxPTR, enc);
|
||||
NSLog(@"GSToUnicode() No iconv for encoding x%02x", enc);
|
||||
result = NO;
|
||||
goto done;
|
||||
}
|
||||
|
@ -2313,7 +2313,7 @@ iconv_start:
|
|||
*/
|
||||
if (estr == 0)
|
||||
{
|
||||
NSLog(@"GSFromUnicode() No iconv for encoding x%02"PRIxPTR, enc);
|
||||
NSLog(@"GSFromUnicode() No iconv for encoding x%02x", enc);
|
||||
result = NO;
|
||||
goto done;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue