@@ -13,12 +13,10 @@
 #include <stdarg.h>
 
 #import "OFObject.h"
 #import "OFArray.h"
 
-#define OF_INVALID_UNICHAR UINT32_MAX
-
 typedef uint32_t of_unichar_t;
 
 enum of_string_encoding {
 	OF_STRING_ENCODING_UTF_8,
 	OF_STRING_ENCODING_ISO_8859_1,
@@ -26,11 +24,11 @@
 	OF_STRING_ENCODING_WINDOWS_1252
 };
 
 extern int of_string_check_utf8(const char*, size_t);
 extern size_t of_string_unicode_to_utf8(of_unichar_t, char*);
-extern of_unichar_t of_string_utf8_to_unicode(const char*, size_t);
+extern size_t of_string_utf8_to_unicode(const char*, size_t, of_unichar_t*);
 extern size_t of_string_position_to_index(const char*, size_t);
 extern size_t of_string_index_to_position(const char*, size_t, size_t);
 
 /**
  * A class for managing strings.