Dash: major warnings cleanup

[vlc] / include / vlc_iso_lang.h

diff --git a/include/vlc_iso_lang.h b/include/vlc_iso_lang.h
index ed984e561e2bd9cf5a70e89dd33460cc81a339d0..9e0b75ce2f03540f418781a1eb08035b94667ad6 100644 (file)
--- a/include/vlc_iso_lang.h
+++ b/include/vlc_iso_lang.h
@@ -22,26 +22,26 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#if !defined( __LIBVLC__ )
-  #error You are not libvlc or one of its plugins. You cannot include this file
-#endif
+/**
+ * \file
+ * This file defines functions and structures for iso639 language codes
+ */
 
 struct iso639_lang_t
 {
-    const char * psz_eng_name;        /* Description in English */
-    const char * psz_native_name;     /* Description in native language */
-    const char * psz_iso639_1;        /* ISO-639-1 (2 characters) code */
-    const char * psz_iso639_2T;       /* ISO-639-2/T (3 characters) English code */
-    const char * psz_iso639_2B;       /* ISO-639-2/B (3 characters) native code */
+    const char *psz_eng_name;    /* Description in English */
+    const char *psz_native_name; /* Description in native language */
+    const char psz_iso639_1[3];  /* ISO-639-1 (2 characters) code */
+    const char psz_iso639_2T[4]; /* ISO-639-2/T (3 characters) English code */
+    const char psz_iso639_2B[4]; /* ISO-639-2/B (3 characters) native code */
 };
 
 #if defined( __cplusplus )
 extern "C" {
 #endif
-VLC_EXPORT( const iso639_lang_t *, GetLang_1, ( const char * ) );
-VLC_EXPORT( const iso639_lang_t *, GetLang_2T, ( const char * ) );
-VLC_EXPORT( const iso639_lang_t *, GetLang_2B, ( const char * ) );
-VLC_EXPORT( const char *, DecodeLanguage, ( uint16_t ) );
+VLC_API const iso639_lang_t * GetLang_1( const char * );
+VLC_API const iso639_lang_t * GetLang_2T( const char * );
+VLC_API const iso639_lang_t * GetLang_2B( const char * );
 #if defined( __cplusplus )
 }
 #endif