clang compilation fix

[vlc] / include / vlc_charset.h

diff --git a/include/vlc_charset.h b/include/vlc_charset.h
index 5d3a1b5c93c67c407eef22c1eab2ba3dcea9a163..cae46c778633c8be451163c1792a0f2a48dfd0ac 100644 (file)
--- a/include/vlc_charset.h
+++ b/include/vlc_charset.h
@@ -81,9 +81,38 @@ static inline char *FromWide (const wchar_t *wide)
 }
 #endif
 
+/**
+ * Converts a nul-terminated string from ISO-8859-1 to UTF-8.
+ */
+static inline char *FromLatin1 (const char *latin)
+{
+    char *str = (char *)malloc (2 * strlen (latin) + 1), *utf8 = str;
+    unsigned char c;
+
+    if (str == NULL)
+        return NULL;
+
+    while ((c = *(latin++)) != '\0')
+    {
+         if (c >= 0x80)
+         {
+             *(utf8++) = 0xC0 | (c >> 6);
+             *(utf8++) = 0x80 | (c & 0x3F);
+         }
+         else
+             *(utf8++) = c;
+    }
+    *(utf8++) = '\0';
+
+    utf8 = (char *)realloc (str, utf8 - str);
+    return utf8 ? utf8 : str;
+}
+
 VLC_EXPORT( const char *, GetFallbackEncoding, ( void ) LIBVLC_USED );
 
 VLC_EXPORT( double, us_strtod, ( const char *, char ** ) LIBVLC_USED );
+VLC_EXPORT( float, us_strtof, ( const char *, char ** ) LIBVLC_USED );
 VLC_EXPORT( double, us_atof, ( const char * ) LIBVLC_USED );
+VLC_EXPORT( int, us_asprintf, ( char **, const char *, ... ) LIBVLC_USED );
 
 #endif