diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:13:11 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:13:11 +0200 |
| commit | 13221a716588dc88c1151e0a0f8eb7cce41d461c (patch) | |
| tree | 3184184f1e984d248e2570ffa05c79589d2c9a1c /libmenu | |
| parent | c4f7b9666f753b320157e6497f9114523878885f (diff) | |
| parent | bb54613ac1211c73a3614db6b7326d7cd9be39da (diff) | |
| download | mpv-13221a716588dc88c1151e0a0f8eb7cce41d461c.tar.bz2 mpv-13221a716588dc88c1151e0a0f8eb7cce41d461c.tar.xz | |
Merge svn changes up to r30663
Conflicts:
gui/cfg.c
libmpcodecs/vd_dmo.c
mplayer.c
Diffstat (limited to 'libmenu')
| -rw-r--r-- | libmenu/menu_filesel.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmenu/menu_filesel.c b/libmenu/menu_filesel.c index 08507bec20..3b239d11d6 100644 --- a/libmenu/menu_filesel.c +++ b/libmenu/menu_filesel.c @@ -146,14 +146,14 @@ static int mylstat(char *dir, char *file,struct stat* st) { char *slash; l -= 3; strcpy(s, dir); -#if defined(__MINGW32__) || defined(__CYGWIN__) +#if HAVE_DOS_PATHS if (s[l] == '/' || s[l] == '\\') #else if (s[l] == '/') #endif s[l] = '\0'; slash = strrchr(s, '/'); -#if defined(__MINGW32__) || defined(__CYGWIN__) +#if HAVE_DOS_PATHS if (!slash) slash = strrchr(s,'\\'); #endif @@ -355,7 +355,7 @@ static void read_cmd(menu_t* menu,int cmd) { if(l <= 1) break; mpriv->dir[l-1] = '\0'; slash = strrchr(mpriv->dir,'/'); -#if defined(__MINGW32__) || defined(__CYGWIN__) +#if HAVE_DOS_PATHS if (!slash) slash = strrchr(mpriv->dir,'\\'); #endif @@ -455,7 +455,7 @@ static int open_fs(menu_t* menu, char* args) { char *slash = NULL; if (filename && !strstr(filename, "://") && (path=realpath(filename, b))) { slash = strrchr(path, '/'); -#if defined(__MINGW32__) || defined(__CYGWIN__) +#if HAVE_DOS_PATHS // FIXME: Do we need and can convert all '\\' in path to '/' on win32? if (!slash) slash = strrchr(path, '\\'); |