From 74fdde2b572d9cd8f6f3306c847c6c9334684b7d Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sun, 3 Jan 2016 16:07:40 +0000 Subject: [PATCH] remove necessity for header change in libutf8proc The combining character class definition was put in the libutf8proc header instead of being local to the IDNA implementation. --- utils/idna.c | 4 ++-- utils/idna.h | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/utils/idna.c b/utils/idna.c index d8d4ae497..2d1bb4ccb 100644 --- a/utils/idna.c +++ b/utils/idna.c @@ -168,7 +168,7 @@ static bool idna__contextj_rule(int32_t *label, int index, size_t len) return false; /* No previous character */ } unicode_props = utf8proc_get_property(label[index - 1]); - if (unicode_props->combining_class == UTF8PROC_CCC_VIRAMA) { + if (unicode_props->combining_class == IDNA_UNICODE_CCC_VIRAMA) { return true; } @@ -207,7 +207,7 @@ static bool idna__contextj_rule(int32_t *label, int index, size_t len) return false; /* No previous character */ } unicode_props = utf8proc_get_property(label[index - 1]); - if (unicode_props->combining_class == UTF8PROC_CCC_VIRAMA) { + if (unicode_props->combining_class == IDNA_UNICODE_CCC_VIRAMA) { return true; } return false; diff --git a/utils/idna.h b/utils/idna.h index c59a22763..1fb344730 100644 --- a/utils/idna.h +++ b/utils/idna.h @@ -23,6 +23,11 @@ #ifndef _NETSURF_UTILS_IDNA_H_ #define _NETSURF_UTILS_IDNA_H_ +/** + * Unicode canonical combining class for virama + */ +#define IDNA_UNICODE_CCC_VIRAMA 9 + /** * Convert a hostname to an ACE version suitable for DNS lookup *