Commit 98a7eee3 authored by Antoine Cellerier's avatar Antoine Cellerier

* Force cast to vlc_object_t when calling config_GetDataDir.

parent 18959e10
...@@ -210,7 +210,8 @@ VLC_EXPORT( module_t *, config_FindModule,( vlc_object_t *, const char * ) ); ...@@ -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( 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_GetType(a,b) __config_GetType(VLC_OBJECT(a),b)
#define config_GetInt(a,b) __config_GetInt(VLC_OBJECT(a),b) #define config_GetInt(a,b) __config_GetInt(VLC_OBJECT(a),b)
......
...@@ -1713,7 +1713,7 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[], ...@@ -1713,7 +1713,7 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[],
* *
* @return a string (always succeeds). * @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) #if defined (WIN32) || defined (UNDER_CE)
return vlc_global( p_this )->psz_vlcpath; return vlc_global( p_this )->psz_vlcpath;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment