getopt: remove useless global variable

[vlc] / src / config / configuration.h

diff --git a/src/config/configuration.h b/src/config/configuration.h
index 6533c211fd98c0a480ea9c813a58d8ffd1da5998..6fae3c0eb1b6415954702d2eec3de3daf97a4c60 100644 (file)
--- a/src/config/configuration.h
+++ b/src/config/configuration.h
@@ -36,14 +36,15 @@ int  config_AutoSaveConfigFile( vlc_object_t * );
 
 void config_Free( module_t * );
 
-void config_SetCallbacks( module_config_t *, module_config_t *, size_t );
-void config_UnsetCallbacks( module_config_t *, size_t );
+int config_LoadCmdLine   ( vlc_object_t *, int *, const char *[], bool );
+int config_LoadConfigFile( vlc_object_t *, const char * );
+#define config_LoadCmdLine(a,b,c,d) config_LoadCmdLine(VLC_OBJECT(a),b,c,d)
+#define config_LoadConfigFile(a,b) config_LoadConfigFile(VLC_OBJECT(a),b)
 
-#define config_LoadCmdLine(a,b,c,d) __config_LoadCmdLine(VLC_OBJECT(a),b,c,d)
-#define config_LoadConfigFile(a,b) __config_LoadConfigFile(VLC_OBJECT(a),b)
+int config_SortConfig (void);
+void config_UnsortConfig (void);
 
-int __config_LoadCmdLine   ( vlc_object_t *, int *, const char *[], bool );
-int __config_LoadConfigFile( vlc_object_t *, const char * );
+char *config_GetDataDirDefault( void );
 
 int IsConfigStringType( int type );
 int IsConfigIntegerType (int type);
@@ -52,7 +53,10 @@ static inline int IsConfigFloatType (int type)
     return type == CONFIG_ITEM_FLOAT;
 }
 
-int ConfigStringToKey( const char * );
+uint_fast32_t ConfigStringToKey( const char * );
+char *ConfigKeyToString( uint_fast32_t );
+
+extern vlc_rwlock_t config_lock;
 
 /* The configuration file */
 #define CONFIG_FILE                     "vlcrc"