Commit e104a2e6 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Use the same directory layout on all platforms.

It was an artificially-created mess. Besides, many other Windows
applications also have a data, datadir or share directory.
parent 3f02d5dd
This diff is collapsed.
...@@ -53,9 +53,7 @@ ...@@ -53,9 +53,7 @@
*/ */
const char *config_GetDataDir( void ) const char *config_GetDataDir( void )
{ {
#if defined (WIN32) || defined (UNDER_CE) #if defined (WIN32) || defined(__APPLE__) || defined (SYS_BEOS)
return vlc_global()->psz_vlcpath;
#elif defined(__APPLE__) || defined (SYS_BEOS)
static char path[PATH_MAX] = ""; static char path[PATH_MAX] = "";
if( *path == '\0' ) if( *path == '\0' )
...@@ -77,9 +75,7 @@ const char *config_GetDataDir( void ) ...@@ -77,9 +75,7 @@ const char *config_GetDataDir( void )
*/ */
const char *config_GetConfDir( void ) const char *config_GetConfDir( void )
{ {
#if defined (WIN32) || defined (UNDER_CE) #if defined (WIN32) || defined(__APPLE__) || defined (SYS_BEOS)
return vlc_global()->psz_vlcpath;
#elif defined(__APPLE__) || defined (SYS_BEOS)
static char path[PATH_MAX] = ""; static char path[PATH_MAX] = "";
if( *path == '\0' ) if( *path == '\0' )
......
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