mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-30 00:11:26 +00:00
Recommit gcc-4 tweaks
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@21431 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
18c6fddb3b
commit
7c4a87c2c0
53 changed files with 466 additions and 322 deletions
|
@ -212,6 +212,22 @@ static inline NSComparisonResult GSeq_compare(GSeq s0, GSeq s1)
|
|||
unichar *c0 = s0->chars;
|
||||
unichar *c1 = s1->chars;
|
||||
|
||||
len0 = s0->count;
|
||||
len1 = s1->count;
|
||||
if (len0 == len1)
|
||||
{
|
||||
for (i = 0; i < len1; i++)
|
||||
{
|
||||
if (c0[i] != c1[i])
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (i == len0)
|
||||
{
|
||||
return NSOrderedSame;
|
||||
}
|
||||
}
|
||||
if (s0->normalized == NO)
|
||||
GSeq_normalize(s0);
|
||||
if (s1->normalized == NO)
|
||||
|
@ -394,7 +410,7 @@ GSEQ_STRCOMP(NSString *ss, NSString *os, unsigned mask, NSRange aRange)
|
|||
#if GSEQ_S == GSEQ_US
|
||||
unichar *sBuf;
|
||||
#else
|
||||
char *sBuf;
|
||||
unsigned char *sBuf;
|
||||
#endif
|
||||
#endif
|
||||
#if GSEQ_O == GSEQ_NS
|
||||
|
@ -404,7 +420,7 @@ GSEQ_STRCOMP(NSString *ss, NSString *os, unsigned mask, NSRange aRange)
|
|||
#if GSEQ_O == GSEQ_US
|
||||
unichar *oBuf;
|
||||
#else
|
||||
char *oBuf;
|
||||
unsigned char *oBuf;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue