Merge branch 1.0-bugfix (early part) into master

[vlc] / src / config / configuration.h

diff --git a/src/config/configuration.h b/src/config/configuration.h
index 9d1ba85220777e1a5c34f5d992c7b3c1d70c9855..44884c986e02915eb6cf1b863ff5f036bca836a8 100644 (file)
--- a/src/config/configuration.h
+++ b/src/config/configuration.h
@@ -43,7 +43,6 @@ void config_UnsetCallbacks( module_config_t *, size_t );
 #define config_LoadConfigFile(a,b) __config_LoadConfigFile(VLC_OBJECT(a),b)
 
 int __config_LoadCmdLine   ( vlc_object_t *, int *, const char *[], bool );
-char *config_GetCustomConfigFile( libvlc_int_t * );
 int __config_LoadConfigFile( vlc_object_t *, const char * );
 
 int IsConfigStringType( int type );