* Force cast to vlc_object_t when calling config_GetDataDir.

diff --git a/include/vlc_configuration.h b/include/vlc_configuration.h
index a0235d5ddf6ea0ca492dd6bc84cf5962c3936aec..f0847f4f42e5025575b6f8536bbd9f0df5cb8d72 100644 (file)
--- a/include/vlc_configuration.h
+++ b/include/vlc_configuration.h
@@ -210,7 +210,8 @@ VLC_EXPORT( module_t *, config_FindModule,( vlc_object_t *, const char * ) );
 
 VLC_EXPORT( int, config_Duplicate,( module_t *, const module_config_t *, size_t ));
 
-VLC_EXPORT(const char *, config_GetDataDir, ( const vlc_object_t * ));
+#define config_GetDataDir( a ) __config_GetDataDir( VLC_OBJECT( a ) )
+VLC_EXPORT(const char *, __config_GetDataDir, ( const vlc_object_t * ));
 
 #define config_GetType(a,b) __config_GetType(VLC_OBJECT(a),b)
 #define config_GetInt(a,b) __config_GetInt(VLC_OBJECT(a),b)

diff --git a/src/modules/configuration.c b/src/modules/configuration.c
index 0ff79a8bd6590ec3ab143a24c4a77ca8c4c6cc84..4b2089f97f2e089ae34a0afaf8f8f223ab2b8ca4 100644 (file)
--- a/src/modules/configuration.c
+++ b/src/modules/configuration.c
@@ -1713,7 +1713,7 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[],
  *
  * @return a string (always succeeds).
  */
-const char *config_GetDataDir( const vlc_object_t *p_this )
+const char *__config_GetDataDir( const vlc_object_t *p_this )
 {
 #if defined (WIN32) || defined (UNDER_CE)
     return vlc_global( p_this )->psz_vlcpath;