@@ -54,24 +54,10 @@ #ifdef OF_HAVE_BLOCKS typedef void (^of_string_line_enumeration_block_t)(OFString *line, BOOL *stop); #endif -#ifdef __cplusplus -extern "C" { -#endif -extern int of_string_utf8_check(const char*, size_t, size_t*); -extern size_t of_string_utf8_encode(of_unichar_t, char*); -extern size_t of_string_utf8_decode(const char*, size_t, of_unichar_t*); -extern size_t of_string_utf8_get_index(const char*, size_t); -extern size_t of_string_utf8_get_position(const char*, size_t, size_t); -extern size_t of_unicode_string_length(const of_unichar_t*); -extern size_t of_utf16_string_length(const uint16_t*); -#ifdef __cplusplus -} -#endif - @class OFArray; @class OFURL; /*! * @brief A class for handling strings. @@ -964,5 +950,16 @@ #ifndef NSINTEGER_DEFINED /* Required for string boxing literals to work */ @compatibility_alias NSString OFString; #endif + +#ifdef __cplusplus +extern "C" { +#endif +extern size_t of_string_utf8_encode(of_unichar_t, char*); +extern size_t of_string_utf8_decode(const char*, size_t, of_unichar_t*); +extern size_t of_string_utf16_length(const uint16_t*); +extern size_t of_string_unicode_length(const of_unichar_t*); +#ifdef __cplusplus +} +#endif