X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=include%2Fvlc_config_cat.h;h=e21c29e8fc40ce6b6e4d49d0b9e6ff8afa057e00;hb=67a55f9c6be8d6cb905a201ffe8d40f89032d7af;hp=931fc52afcaf56b52e2f859c19cb437de7eab5a7;hpb=fbf4c8060d35617e39b50ae739307152d02ed951;p=vlc diff --git a/include/vlc_config_cat.h b/include/vlc_config_cat.h index 931fc52afc..e21c29e8fc 100644 --- a/include/vlc_config_cat.h +++ b/include/vlc_config_cat.h @@ -22,10 +22,6 @@ * 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 - #ifndef _VLC_HELP_H #define _VLC_HELP_H 1 @@ -239,8 +235,9 @@ #define UNKNOWN_HELP N_("There is no help available for these modules.") /* This function is deprecated and is kept only for compatibility */ -static inline char * GetCapabilityHelp( char *psz_capability, int i_type) +static inline const char * GetCapabilityHelp( char *psz_capability, int i_type) { + (void)psz_capability; (void)i_type; return " "; } @@ -295,7 +292,7 @@ static struct config_category_t categories_array[] = { -1, NULL, NULL } }; -static inline char *config_CategoryNameGet( int i_value ) +static inline const char *config_CategoryNameGet( int i_value ) { int i = 0 ; while( categories_array[i].psz_name != NULL ) @@ -309,7 +306,7 @@ static inline char *config_CategoryNameGet( int i_value ) return NULL; } -static inline char *config_CategoryHelpGet( int i_value ) +static inline const char *config_CategoryHelpGet( int i_value ) { int i = 0 ; while( categories_array[i].psz_help != NULL )