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

fix check for unicode normalisation

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@36871 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2013-07-11 12:41:56 +00:00
parent 292ae66048
commit 2f99328775
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Source/NSString.m
View file

@ -662,6 +662,7 @@ GSICUCollatorOpen(NSStringCompareOptions mask, NSLocale *locale)
return NULL; return NULL;
} }
#if defined(HAVE_UNICODE_UNORM2_H)
- (NSString *) _normalizedICUStringOfType: (const char*)normalization - (NSString *) _normalizedICUStringOfType: (const char*)normalization
mode: (UNormalization2Mode)mode mode: (UNormalization2Mode)mode
{ {
@ -750,6 +751,7 @@ GSICUCollatorOpen(NSStringCompareOptions mask, NSLocale *locale)
return AUTORELEASE(newString); return AUTORELEASE(newString);
} }
#endif #endif
#endif
+ (void) atExit + (void) atExit
{ {
@ -1769,7 +1771,7 @@ GSICUCollatorOpen(NSStringCompareOptions mask, NSLocale *locale)
- (NSString *) decomposedStringWithCompatibilityMapping - (NSString *) decomposedStringWithCompatibilityMapping
{ {
#if GS_USE_ICU == 1 #if (GS_USE_ICU == 1) && defined(HAVE_UNICODE_UNORM2_H)
return [self _normalizedICUStringOfType: "nfkc" mode: UNORM2_DECOMPOSE]; return [self _normalizedICUStringOfType: "nfkc" mode: UNORM2_DECOMPOSE];
#else #else
return [self notImplemented: _cmd]; return [self notImplemented: _cmd];
@ -1778,7 +1780,7 @@ GSICUCollatorOpen(NSStringCompareOptions mask, NSLocale *locale)
- (NSString *) decomposedStringWithCanonicalMapping - (NSString *) decomposedStringWithCanonicalMapping
{ {
#if GS_USE_ICU == 1 #if (GS_USE_ICU == 1) && defined(HAVE_UNICODE_UNORM2_H)
return [self _normalizedICUStringOfType: "nfc" mode: UNORM2_DECOMPOSE]; return [self _normalizedICUStringOfType: "nfc" mode: UNORM2_DECOMPOSE];
#else #else
return [self notImplemented: _cmd]; return [self notImplemented: _cmd];
@ -3931,7 +3933,7 @@ static NSFileManager *fm = nil;
- (NSString *) precomposedStringWithCompatibilityMapping - (NSString *) precomposedStringWithCompatibilityMapping
{ {
#if GS_USE_ICU == 1 #if (GS_USE_ICU == 1) && defined(HAVE_UNICODE_UNORM2_H)
return [self _normalizedICUStringOfType: "nfkc" mode: UNORM2_COMPOSE]; return [self _normalizedICUStringOfType: "nfkc" mode: UNORM2_COMPOSE];
#else #else
return [self notImplemented: _cmd]; return [self notImplemented: _cmd];
@ -3940,7 +3942,7 @@ static NSFileManager *fm = nil;
- (NSString *) precomposedStringWithCanonicalMapping - (NSString *) precomposedStringWithCanonicalMapping
{ {
#if GS_USE_ICU == 1 #if (GS_USE_ICU == 1) && defined(HAVE_UNICODE_UNORM2_H)
return [self _normalizedICUStringOfType: "nfc" mode: UNORM2_COMPOSE]; return [self _normalizedICUStringOfType: "nfc" mode: UNORM2_COMPOSE];
#else #else
return [self notImplemented: _cmd]; return [self notImplemented: _cmd];

3
configure vendored
View file

@ -26090,7 +26090,8 @@ $as_echo "yes" >&6; }
for ac_header in unicode/uloc.h unicode/ulocdata.h unicode/ucol.h unicode/ucurr.h unicode/uregex.h unicode/ucal.h unicode/unum.h unicode/udat.h unicode/udatpg.h unicode/ustring.h unicode/usearch.h unicode/unorm2.h
for ac_header in unicode/uloc.h unicode/ulocdata.h unicode/ucol.h unicode/ucurr.h unicode/uregex.h unicode/ucal.h unicode/unorm2.h unicode/unum.h unicode/udat.h unicode/udatpg.h unicode/ustring.h unicode/usearch.h unicode/unorm2.h
do do
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

2
configure.ac
View file

@ -3204,7 +3204,7 @@ if test $enable_icu = yes; then
if test "$have_icu" = "yes"; then if test "$have_icu" = "yes"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_CHECK_HEADERS(unicode/uloc.h unicode/ulocdata.h unicode/ucol.h unicode/ucurr.h unicode/uregex.h unicode/ucal.h unicode/unum.h unicode/udat.h unicode/udatpg.h unicode/ustring.h unicode/usearch.h unicode/unorm2.h) AC_CHECK_HEADERS(unicode/uloc.h unicode/ulocdata.h unicode/ucol.h unicode/ucurr.h unicode/uregex.h unicode/ucal.h unicode/unorm2.h unicode/unum.h unicode/udat.h unicode/udatpg.h unicode/ustring.h unicode/usearch.h unicode/unorm2.h)
LIBS="$LIBS $ICU_LIBS" LIBS="$LIBS $ICU_LIBS"
LDFLAGS="$LDFLAGS $ICU_LDFLAGS" LDFLAGS="$LDFLAGS $ICU_LDFLAGS"
LDIR_FLAGS="$LDIR_FLAGS $ICU_LDFLAGS" LDIR_FLAGS="$LDIR_FLAGS $ICU_LDFLAGS"