Commit a6590ac0 authored by Sam Hocevar's avatar Sam Hocevar

* include/iso_lang.h: Since the exported functions use the "const" keyword,

    put the declarations in extern "C" {} in C++ modules.
parent 139e0286
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* iso_lang.h: function to decode language code (in dvd or a52 for instance). * iso_lang.h: function to decode language code (in dvd or a52 for instance).
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * Copyright (C) 1998-2001 VideoLAN
* $Id: iso_lang.h,v 1.8 2002/11/11 14:39:11 sam Exp $ * $Id: iso_lang.h,v 1.9 2003/10/24 17:41:58 sam Exp $
* *
* Author: Stphane Borel <stef@via.ecp.fr> * Author: Stphane Borel <stef@via.ecp.fr>
* Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr> * Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
...@@ -31,8 +31,14 @@ struct iso639_lang_t ...@@ -31,8 +31,14 @@ struct iso639_lang_t
char * psz_iso639_2B; /* ISO-639-2/B (3 characters) native code */ char * psz_iso639_2B; /* 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_1, ( const char * ) );
VLC_EXPORT( const iso639_lang_t *, GetLang_2T, ( 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 iso639_lang_t *, GetLang_2B, ( const char * ) );
VLC_EXPORT( const char *, DecodeLanguage, ( uint16_t ) ); VLC_EXPORT( const char *, DecodeLanguage, ( uint16_t ) );
#if defined( __cplusplus )
}
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment