# HG changeset patch # User komh # Date 1266570841 0 # Node ID c05fbacce55f7d89aa83639d6130c7c48152a286 # Parent c6356454b7240b8c651143f08a7fb7596c8b87e5 Replace platform preprocessor check by HAVE_DOS_PATHS. This is both more elegant and more portable. diff -r c6356454b724 -r c05fbacce55f libmenu/menu_filesel.c --- a/libmenu/menu_filesel.c Fri Feb 19 09:12:23 2010 +0000 +++ b/libmenu/menu_filesel.c Fri Feb 19 09:14:01 2010 +0000 @@ -147,14 +147,14 @@ 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 @@ -356,7 +356,7 @@ 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 @@ -456,7 +456,7 @@ 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, '\\'); diff -r c6356454b724 -r c05fbacce55f stream/stream_file.c --- a/stream/stream_file.c Fri Feb 19 09:12:23 2010 +0000 +++ b/stream/stream_file.c Fri Feb 19 09:14:01 2010 +0000 @@ -130,7 +130,7 @@ return STREAM_ERROR; } -#if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__OS2__) +#if HAVE_DOS_PATHS // extract '/' from '/x:/path' if( filename[ 0 ] == '/' && filename[ 1 ] && filename[ 2 ] == ':' ) filename++; diff -r c6356454b724 -r c05fbacce55f subreader.c --- a/subreader.c Fri Feb 19 09:12:23 2010 +0000 +++ b/subreader.c Fri Feb 19 09:14:01 2010 +0000 @@ -1856,7 +1856,7 @@ subcnt = 0; tmp = strrchr(fname,'/'); -#if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__OS2__) +#if HAVE_DOS_PATHS if(!tmp)tmp = strrchr(fname,'\\'); if(!tmp)tmp = strrchr(fname,':'); #endif