diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-02-09 11:55:59 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-02-10 13:02:56 +0000 |
| commit | d665191382645b5678aa8acd796b08b0fe43e7c5 (patch) | |
| tree | cca418af926437ebaa7c795a80709da3158878fb /svl | |
| parent | 7a555784b23fbeccea10feaebfc66cdbbf8a4584 (diff) | |
UIDNA_CHECK_CONTEXTO is only available in ICU >= 49
...unlike the rest of the createUTS46Instance stuff, which is available in 4.6.
While it is desirable to have that check here, it probably doesn't make much of
a difference in practice, and Rico Tzschichholz would like to have this working
on Ubuntu 12.04, where only ICU 4.8.1 is available.
Change-Id: I5bbd2ed296c6e068e175e7f8353cea37ed4d9e44
(cherry picked from commit f1cb83cef59c3b1d5ee780e8916832483468fab7)
Reviewed-on: https://gerrit.libreoffice.org/22227
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/misc/urihelper.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx index 0746cb221ce3..a27e5b3a02cb 100644 --- a/svl/source/misc/urihelper.cxx +++ b/svl/source/misc/urihelper.cxx @@ -761,7 +761,10 @@ OUString URIHelper::resolveIdnaHost(OUString const & url) { std::unique_ptr<icu::IDNA> idna( icu::IDNA::createUTS46Instance( (UIDNA_USE_STD3_RULES | UIDNA_CHECK_BIDI | UIDNA_CHECK_CONTEXTJ - | UIDNA_CHECK_CONTEXTO), +#if U_ICU_VERSION_MAJOR_NUM >= 49 + | UIDNA_CHECK_CONTEXTO +#endif + ), e)); if (U_FAILURE(e)) { SAL_WARN("vcl.gdi", "icu::IDNA::createUTS46Instance " << e); |