Merge branch 'issue-381' into 'master'

Always define _cairo_utf8_to_utf16 on Windows

Closes #381

See merge request cairo/cairo!209
This commit is contained in:
Uli Schlachter 2021-07-23 12:11:30 +00:00
commit b408352d45

View file

@ -1912,7 +1912,7 @@ cairo_private int
_cairo_ucs4_to_utf16 (uint32_t unicode,
uint16_t *utf16);
#if CAIRO_HAS_WIN32_FONT || CAIRO_HAS_QUARTZ_FONT || CAIRO_HAS_PDF_OPERATORS
#if _WIN32 || CAIRO_HAS_WIN32_FONT || CAIRO_HAS_QUARTZ_FONT || CAIRO_HAS_PDF_OPERATORS
# define CAIRO_HAS_UTF8_TO_UTF16 1
#endif
#if CAIRO_HAS_UTF8_TO_UTF16