@@ -76,14 +76,15 @@ lossy: (bool)lossy; - (OFString*)OF_JSONRepresentationWithOptions: (int)options depth: (size_t)depth; @end -extern bool of_unicode_to_iso_8859_15(const of_unichar_t*, char*, size_t, bool); -extern bool of_unicode_to_windows_1252(const of_unichar_t*, char*, size_t, +extern bool of_unicode_to_iso_8859_15(const of_unichar_t*, uint8_t*, size_t, + bool); +extern bool of_unicode_to_windows_1252(const of_unichar_t*, uint8_t*, size_t, bool); -extern bool of_unicode_to_codepage_437(const of_unichar_t*, char*, size_t, +extern bool of_unicode_to_codepage_437(const of_unichar_t*, uint8_t*, size_t, bool); /* References for static linking */ void _references_to_categories_of_OFString(void) { @@ -1067,34 +1068,34 @@ return length; case OF_STRING_ENCODING_ISO_8859_15: if (length + 1 > maxLength) @throw [OFOutOfRangeException exception]; - if (!of_unicode_to_iso_8859_15(characters, cString, length, - lossy)) + if (!of_unicode_to_iso_8859_15(characters, (uint8_t*)cString, + length, lossy)) @throw [OFInvalidEncodingException exception]; cString[length] = '\0'; return length; case OF_STRING_ENCODING_WINDOWS_1252: if (length + 1 > maxLength) @throw [OFOutOfRangeException exception]; - if (!of_unicode_to_windows_1252(characters, cString, length, - lossy)) + if (!of_unicode_to_windows_1252(characters, (uint8_t*)cString, + length, lossy)) @throw [OFInvalidEncodingException exception]; cString[length] = '\0'; return length; case OF_STRING_ENCODING_CODEPAGE_437: if (length + 1 > maxLength) @throw [OFOutOfRangeException exception]; - if (!of_unicode_to_codepage_437(characters, cString, length, - lossy)) + if (!of_unicode_to_codepage_437(characters, (uint8_t*)cString, + length, lossy)) @throw [OFInvalidEncodingException exception]; cString[length] = '\0'; return length;