diff options
| author | Brad Pitcher <bradpitcher@gmail.com> | 2011-11-01 17:15:35 (GMT) |
|---|---|---|
| committer | Brad Pitcher <bradpitcher@gmail.com> | 2011-11-01 17:15:35 (GMT) |
| commit | e2caf3726d68ff1fef63113519049abffc0563af (patch) | |
| tree | 6558c6f03ccc21e7138d23861f80e8d97b09e60e /src/lexer.l | |
| parent | 7541854212d6c1223e015faf55a6ca0657a1c184 (diff) | |
| parent | cb56f700b1b0f4ae589da62a5fd1d4e368deb604 (diff) | |
merge master
Diffstat (limited to 'src/lexer.l')
| -rw-r--r-- | src/lexer.l | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/lexer.l b/src/lexer.l index 3cd4a19..d9ccd76 100644 --- a/src/lexer.l +++ b/src/lexer.l @@ -35,8 +35,11 @@ #include <QDir> #include <assert.h> -//isatty for visual c++ -#ifdef _MSC_VER +//isatty for visual c++ and mingw-cross-env +#if defined __WIN32__ && ! defined _MSC_VER +#include "unistd.h" +#endif +#if defined __WIN32__ || defined _MSC_VER extern "C" int __cdecl _isatty(int _FileHandle); #define isatty _isatty #endif @@ -97,7 +100,7 @@ include[ \t\r\n>]*"<" { BEGIN(include); } } -use[ \t\r\n>]*"<"[^ \t\r\n>]+">" { +use[ \t\r\n>]*"<"[^\t\r\n>]+">" { QString filename(yytext); filename.remove(QRegExp("^use[ \t\r\n>]*<")); filename.remove(QRegExp(">$")); |