gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 16:50:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Headers/Foundation/NSString.h

Browse source 
make NSStringEncoding enum typdef to NSUInteger
        * Source/Additions/Unicode.m     
          fix format string to print out NSStringEncoding

OK Richard



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@36678 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
buzzdee 2013-05-29 16:05:41 +00:00
parent 44ff05f3bf
commit 7358c7d942
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2013-05-29 Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
* Headers/Foundation/NSString.h
make NSStringEncoding enum typdef to NSUInteger
* Source/Additions/Unicode.m
fix format string to print out NSStringEncoding
2013-05-17 Ivan Vučica <ivan@vucica.net> 2013-05-17 Ivan Vučica <ivan@vucica.net>
* Source/NSDate.m: * Source/NSDate.m:

5
Headers/Foundation/NSString.h
View file

@ -148,7 +148,7 @@ typedef NSUInteger NSStringCompareOptions;
* NSGSM0338StringEncoding, NSBIG5StringEncoding, * NSGSM0338StringEncoding, NSBIG5StringEncoding,
* NSKoreanEUCStringEncoding</code>.</p> * NSKoreanEUCStringEncoding</code>.</p>
*/ */
typedef enum _NSStringEncoding enum
{ {
/* NB. Must not have an encoding with value zero - so we can use zero to /* 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 tell that a variable that should contain an encoding has not yet been
@ -204,7 +204,8 @@ typedef enum _NSStringEncoding
NSUTF32BigEndianStringEncoding = 0x98000100, NSUTF32BigEndianStringEncoding = 0x98000100,
NSUTF32LittleEndianStringEncoding = 0x9c000100 NSUTF32LittleEndianStringEncoding = 0x9c000100
#endif #endif
} NSStringEncoding; };
typedef NSUInteger NSStringEncoding;
enum { enum {
NSOpenStepUnicodeReservedBase = 0xF400 NSOpenStepUnicodeReservedBase = 0xF400

4
Source/Additions/Unicode.m
View file

@ -1350,7 +1350,7 @@ tables:
*/ */
if (estr == 0) if (estr == 0)
{ {
NSLog(@"GSToUnicode() No iconv for encoding x%02x", enc); NSLog(@"GSToUnicode() No iconv for encoding x%02"PRIxPTR, enc);
result = NO; result = NO;
goto done; goto done;
} }
@ -2313,7 +2313,7 @@ iconv_start:
*/ */
if (estr == 0) if (estr == 0)
{ {
NSLog(@"GSFromUnicode() No iconv for encoding x%02x", enc); NSLog(@"GSFromUnicode() No iconv for encoding x%02"PRIxPTR, enc);
result = NO; result = NO;
goto done; goto done;
} }