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.
This commit is contained in:
Vincent Sanders 2016-01-03 16:07:40 +00:00
parent b54a1fe4cb
commit 74fdde2b57
2 changed files with 7 additions and 2 deletions

View File

@ -168,7 +168,7 @@ static bool idna__contextj_rule(int32_t *label, int index, size_t len)
return false; /* No previous character */ return false; /* No previous character */
} }
unicode_props = utf8proc_get_property(label[index - 1]); 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 true;
} }
@ -207,7 +207,7 @@ static bool idna__contextj_rule(int32_t *label, int index, size_t len)
return false; /* No previous character */ return false; /* No previous character */
} }
unicode_props = utf8proc_get_property(label[index - 1]); 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 true;
} }
return false; return false;

View File

@ -23,6 +23,11 @@
#ifndef _NETSURF_UTILS_IDNA_H_ #ifndef _NETSURF_UTILS_IDNA_H_
#define _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 * Convert a hostname to an ACE version suitable for DNS lookup
* *