Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Jan Steemann 2012-09-20 11:33:39 +02:00
parent 879573944c cb3770a9ae
commit dba9e6e29c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Basics/Utf8Helper.cpp
View File

@ -29,7 +29,7 @@
#include "Utf8Helper.h"
#ifdef TRI_HAVE_ICU
#include "BasicsC/utf8-helper.h"
#include "unicode/normalizer2.h"
#else
#include "string.h"
#endif
@ -160,7 +160,7 @@ v8::Handle<v8::Value> Utf8Helper::normalize (v8::Handle<v8::Value> obj) {
if (str_len > 0) {
#ifdef TRI_HAVE_ICU
UErrorCode erroCode = U_ZERO_ERROR;
const Normalizer2* normalizer = Normalizer2::getNFCInstance(erroCode);
const Normalizer2* normalizer = Normalizer2::getInstance(NULL, "nfc", UNORM2_COMPOSE ,erroCode);
if (U_FAILURE(erroCode)) {
LOGGER_ERROR << "error in Normalizer2::getNFCInstance(erroCode): " << u_errorName(erroCode);

4
m4/external.icu
View File

@ -36,8 +36,8 @@ if test "x$tr_ICU" = xyes; then
if $ICU_CONFIG --version > /dev/null 2>&1; then
ICU_CPPFLAGS="$($ICU_CONFIG --cppflags)"
ICU_LDFLAGS="$($ICU_CONFIG --ldflags)"
ICU_LIBS=""
ICU_LDFLAGS=""
ICU_LIBS="$($ICU_CONFIG --ldflags)"
TRI_ICU_VERSION="$($ICU_CONFIG --version)"
AC_MSG_RESULT([yes])
else