More robust check for Windows ICU

Also ensure that we don't include both unicode/*.h and icu.h.
This commit is contained in:
Frederik Seiffert 2021-08-06 09:29:11 +02:00 committed by Frederik Seiffert
parent 5120069a88
commit b41953d274
8 changed files with 35 additions and 52 deletions

View file

@ -3,8 +3,7 @@
#if defined(HAVE_UNICODE_UTEXT_H)
#include <unicode/utext.h>
#endif
#if defined(HAVE_ICU_H)
#elif defined(HAVE_ICU_H)
#include <icu.h>
// icu.h in Windows 10 is missing a declaration of UTEXT_MAGIC
#ifndef UTEXT_MAGIC