* Other way around of course

[vlc] / include / configuration.h

diff --git a/include/configuration.h b/include/configuration.h
index 289c0c196b6766f90774f5b98475426b2a5917fc..6bea943c808540c78269127365e1b756166131eb 100644 (file)
--- a/include/configuration.h
+++ b/include/configuration.h
@@ -334,7 +334,7 @@ int config_AutoSaveConfigFile( vlc_object_t * );
     add_typename_inner( CONFIG_ITEM_BOOL, name, text, longtext, advc, p_callback ); \
     p_config[i_config].i_value = value
 
-/* For option renamed */
+/* For renamed option */
 #define add_deprecated( name, strict ) \
     add_config_inner( ); \
     p_config[ i_config ].i_type = p_config[ i_config -1 ].i_type; \
@@ -344,7 +344,7 @@ int config_AutoSaveConfigFile( vlc_object_t * );
         ? p_config[ i_config-1 ].psz_current \
         : p_config[ i_config-1 ].psz_name;
 
-/* For option suppressed*/
+/* For removed option */
 #define add_suppressed_inner( name, type ) \
     add_type_inner( type ); \
     p_config[ i_config ].psz_name = name; \
@@ -373,7 +373,7 @@ int config_AutoSaveConfigFile( vlc_object_t * );
 
 #define change_integer_list( list, list_text, list_update_func ) \
     p_config[i_config].i_list = sizeof(list)/sizeof(int); \
-    p_config[i_config].pi_list = list; \
+    p_config[i_config].pi_list = (int *)list; \
     p_config[i_config].ppsz_list_text = list_text;
 
 #define change_integer_range( min, max ) \
@@ -391,7 +391,7 @@ int config_AutoSaveConfigFile( vlc_object_t * );
     p_config[i_config].ppf_action = (vlc_callback_t *) \
       realloc( p_config[i_config].ppf_action, \
       (p_config[i_config].i_action + 1) * sizeof(void *) ); \
-    p_config[i_config].ppsz_action_text = (char **)\
+    p_config[i_config].ppsz_action_text = (const char **)\
       realloc( p_config[i_config].ppsz_action_text, \
       (p_config[i_config].i_action + 1) * sizeof(void *) ); \
     p_config[i_config].ppf_action[p_config[i_config].i_action] = pf_action; \
@@ -421,11 +421,11 @@ struct config_chain_t
 };
 
 #define config_ChainParse( a, b, c, d ) __config_ChainParse( VLC_OBJECT(a), b, c, d )
-VLC_EXPORT( void,   __config_ChainParse, ( vlc_object_t *, char *psz_prefix, const char **ppsz_options, config_chain_t * ) );
-VLC_EXPORT( char *, config_ChainCreate, ( char **, config_chain_t **, char * ) );
+VLC_EXPORT( void,   __config_ChainParse, ( vlc_object_t *, const char *psz_prefix, const char **ppsz_options, config_chain_t * ) );
+VLC_EXPORT( char *, config_ChainCreate, ( char **, config_chain_t **, const char * ) );
 VLC_EXPORT( void, config_ChainDestroy, ( config_chain_t * ) );
 
-static inline config_chain_t *config_chain_find( config_chain_t *p_cfg, char *psz_name )
+static inline config_chain_t *config_chain_find( config_chain_t *p_cfg, const char *psz_name )
 {
     while( p_cfg && strcmp( p_cfg->psz_name, psz_name ) )
     {
@@ -435,7 +435,7 @@ static inline config_chain_t *config_chain_find( config_chain_t *p_cfg, char *ps
     return p_cfg;
 }
 
-static inline char *config_chain_find_value( config_chain_t *p_cfg, char *psz_name )
+static inline char *config_chain_find_value( config_chain_t *p_cfg, const char *psz_name )
 {
     while( p_cfg && strcmp( p_cfg->psz_name, psz_name ) )
     {