diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2012-12-26 15:59:17 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2012-12-26 15:59:17 (GMT) |
commit | 48f4de5c47d55b6622b6fdc9b5c288e19d5692f9 (patch) | |
tree | 629c4681a5158d26512b815623754b33165d8d23 /src/config.l | |
parent | fee4053bd3dd075a2dd2cba4da8166ec5307eadd (diff) | |
download | Doxygen-48f4de5c47d55b6622b6fdc9b5c288e19d5692f9.zip Doxygen-48f4de5c47d55b6622b6fdc9b5c288e19d5692f9.tar.gz Doxygen-48f4de5c47d55b6622b6fdc9b5c288e19d5692f9.tar.bz2 |
Release-1.8.3
Diffstat (limited to 'src/config.l')
-rw-r--r-- | src/config.l | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/src/config.l b/src/config.l index 7c37dea..0422411 100644 --- a/src/config.l +++ b/src/config.l @@ -506,26 +506,9 @@ static FILE *tryPath(const char *path,const char *fileName) static void substEnvVarsInStrList(QStrList &sl); static void substEnvVarsInString(QCString &s); -static bool isAbsolute(const char * fileName) -{ -# ifdef _WIN32 - if (isalpha (fileName [0]) && fileName[1] == ':') - fileName += 2; -# endif - char const fst = fileName [0]; - if (fst == '/') { - return true; - } -# ifdef _WIN32 - if (fst == '\\') - return true; -# endif - return false; -} - static FILE *findFile(const char *fileName) { - if(isAbsolute(fileName)) + if(portable_isAbsolutePath(fileName)) return tryPath(NULL, fileName); substEnvVarsInStrList(includePathList); char *s=includePathList.first(); @@ -1458,7 +1441,7 @@ void Config::check() config_err("error: Unsupported value for MATHJAX_FORMAT: Should be one of HTML-CSS, NativeMML, or SVG\n"); Config_getEnum("MATHJAX_FORMAT")="HTML-CSS"; } - + // add default words if needed QStrList &annotationFromBrief = Config_getList("ABBREVIATE_BRIEF"); if (annotationFromBrief.isEmpty()) |