From 770e329cceaf0620c7b482589a9b17ed1d19c16d Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Wed, 23 Nov 2016 15:37:11 +0000 Subject: Change API to match upstream. I upstreamed something like our change, so now NetSurf should be able to build with this or upstream. https://github.com/JuliaLang/utf8proc/commit/70bbed8626e902d8c1e2b8277b0c61efb8a460bb I suggest we start building against upstream, as they have other improvements since this fork. --- include/libutf8proc/utf8proc.h | 2 +- src/utf8proc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/libutf8proc/utf8proc.h b/include/libutf8proc/utf8proc.h index 1731703..082bc83 100644 --- a/include/libutf8proc/utf8proc.h +++ b/include/libutf8proc/utf8proc.h @@ -482,7 +482,7 @@ UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_decompose( * Reencodes the sequence of unicode characters given by the pointer * 'buffer' and 'length'. See utf8proc_reencode for further details. */ -UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_normalise(utf8proc_int32_t *buffer, utf8proc_ssize_t length, utf8proc_option_t options); +UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_normalize_utf32(utf8proc_int32_t *buffer, utf8proc_ssize_t length, utf8proc_option_t options); /** * Reencodes the sequence of `length` codepoints pointed to by `buffer` diff --git a/src/utf8proc.c b/src/utf8proc.c index cf64034..0814835 100644 --- a/src/utf8proc.c +++ b/src/utf8proc.c @@ -461,7 +461,7 @@ UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_decompose( return wpos; } -UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_normalise(utf8proc_int32_t *buffer, utf8proc_ssize_t length, utf8proc_option_t options) { +UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_normalize_utf32(utf8proc_int32_t *buffer, utf8proc_ssize_t length, utf8proc_option_t options) { /* UTF8PROC_NULLTERM option will be ignored, 'length' is never ignored ASSERT: 'buffer' has one spare byte of free space at the end! */ if (options & (UTF8PROC_NLF2LS | UTF8PROC_NLF2PS | UTF8PROC_STRIPCC)) { @@ -568,7 +568,7 @@ UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_normalise(utf8proc_int32_t *buffer, } UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_reencode(utf8proc_int32_t *buffer, utf8proc_ssize_t length, utf8proc_option_t options) { - length = utf8proc_normalise(buffer, length, options); + length = utf8proc_normalize_utf32(buffer, length, options); if (length < 0) return length; { -- cgit v1.2.3