diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2007-12-20 12:30:35 -0500 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2007-12-20 12:30:35 -0500 |
| commit | d0119a5aa24a8b426ec64bb2eaa205b7f08ae58a (patch) | |
| tree | f2f00191a48a07e7e959d096e541d24f4a456a19 | |
| parent | 281b11aef14f04b12639028e2a76bbdc7a1a32bf (diff) | |
[cairo-unicode] Don't compile _cairo_utf8_to_utf16 on Linux
The _cairo_utf8_to_utf16() is only used in win32 and atsui font backends.
Don't build it if none of those two are available.
| -rw-r--r-- | src/cairo-unicode.c | 2 | ||||
| -rw-r--r-- | src/cairoint.h | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/cairo-unicode.c b/src/cairo-unicode.c index 2b224a3a..18b9143d 100644 --- a/src/cairo-unicode.c +++ b/src/cairo-unicode.c @@ -258,6 +258,7 @@ _cairo_utf8_to_ucs4 (const unsigned char *str, return CAIRO_STATUS_SUCCESS; } +#if CAIRO_HAS_UTF8_TO_UTF16 /** * _cairo_utf8_to_utf16: * @str: an UTF-8 string @@ -333,3 +334,4 @@ _cairo_utf8_to_utf16 (const unsigned char *str, return CAIRO_STATUS_SUCCESS; } +#endif diff --git a/src/cairoint.h b/src/cairoint.h index 5924ab3d..4f8213aa 100644 --- a/src/cairoint.h +++ b/src/cairoint.h @@ -2311,11 +2311,16 @@ _cairo_utf8_to_ucs4 (const unsigned char *str, uint32_t **result, int *items_written); +#if CAIRO_HAS_WIN32_FONT+0 || CAIRO_HAS_ATSUI_FONT+0 +# define CAIRO_HAS_UTF8_TO_UTF16 1 +#endif +#if CAIRO_HAS_UTF8_TO_UTF16 cairo_private cairo_status_t _cairo_utf8_to_utf16 (const unsigned char *str, int len, uint16_t **result, int *items_written); +#endif cairo_private cairo_status_t _cairo_error (cairo_status_t status); |