Commit 58296b6d authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

module: Use PATH_SEP instead of ':'.

parent 286e950b
...@@ -1074,7 +1074,11 @@ extern vlc_threadvar_t msg_context_global_key; ...@@ -1074,7 +1074,11 @@ extern vlc_threadvar_t msg_context_global_key;
#if defined( WIN32 ) || defined( UNDER_CE ) #if defined( WIN32 ) || defined( UNDER_CE )
# define DIR_SEP_CHAR '\\' # define DIR_SEP_CHAR '\\'
# define DIR_SEP "\\" # define DIR_SEP "\\"
# define PATH_SEP_CHAR ';'
# define PATH_SEP ";"
#else #else
# define DIR_SEP_CHAR '/' # define DIR_SEP_CHAR '/'
# define DIR_SEP "/" # define DIR_SEP "/"
# define PATH_SEP_CHAR ':'
# define PATH_SEP ":"
#endif #endif
...@@ -986,7 +986,7 @@ static const char *ppsz_clock_descriptions[] = ...@@ -986,7 +986,7 @@ static const char *ppsz_clock_descriptions[] =
#define PLUGIN_PATH_TEXT N_("Modules search path") #define PLUGIN_PATH_TEXT N_("Modules search path")
#define PLUGIN_PATH_LONGTEXT N_( \ #define PLUGIN_PATH_LONGTEXT N_( \
"Additional path for VLC to look for its modules. You can add " \ "Additional path for VLC to look for its modules. You can add " \
"several paths by concatenating them using ':' as separator") "several paths by concatenating them using " PATH_SEP " as separator")
#define VLM_CONF_TEXT N_("VLM configuration file") #define VLM_CONF_TEXT N_("VLM configuration file")
#define VLM_CONF_LONGTEXT N_( \ #define VLM_CONF_LONGTEXT N_( \
......
...@@ -938,8 +938,8 @@ static void AllocateAllPlugins( vlc_object_t *p_this ) ...@@ -938,8 +938,8 @@ static void AllocateAllPlugins( vlc_object_t *p_this )
{ {
char *psz_fullpath; char *psz_fullpath;
/* Look for a ':' */ /* Look for PATH_SEP_CHAR (a ':' or a ';') */
for( psz_iter = ppsz_path; *psz_iter && *psz_iter != ':'; psz_iter++ ); for( psz_iter = ppsz_path; *psz_iter && *psz_iter != PATH_SEP_CHAR; psz_iter++ );
if( !*psz_iter ) end = true; if( !*psz_iter ) end = true;
else *psz_iter = 0; else *psz_iter = 0;
...@@ -947,7 +947,7 @@ static void AllocateAllPlugins( vlc_object_t *p_this ) ...@@ -947,7 +947,7 @@ static void AllocateAllPlugins( vlc_object_t *p_this )
/* Handle relative as well as absolute paths */ /* Handle relative as well as absolute paths */
#ifdef WIN32 #ifdef WIN32
if( ppsz_path[0] != '\\' && ppsz_path[0] != '/' ) if( ppsz_path[0] != '\\' && ppsz_path[0] != '/' && ppsz_path[0] != ':' )
#else #else
if( ppsz_path[0] != '/' ) if( ppsz_path[0] != '/' )
#endif #endif
......
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