diff options
| author | Marius Kintel <marius@kintel.net> | 2011-04-12 18:35:44 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-04-12 18:35:44 (GMT) |
| commit | d24b3cc84d0701a5423925765e515db7df9614c5 (patch) | |
| tree | 0d63867d8b5a3c6ffe107371caa6b29cf8ad0f02 /src/lexer.l | |
| parent | 633343c47e0d2bced64d47f62e814489b8e76dc2 (diff) | |
| parent | 1754a970a76c071fff91cc7c716aa0b78b4ac6be (diff) | |
Ported recent changes to master into the visitor branch
Diffstat (limited to 'src/lexer.l')
| -rw-r--r-- | src/lexer.l | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/lexer.l b/src/lexer.l index 932711b..0da3f5d 100644 --- a/src/lexer.l +++ b/src/lexer.l @@ -1,6 +1,7 @@ /* - * OpenSCAD (www.openscad.at) - * Copyright (C) 2009 Clifford Wolf <clifford@clifford.at> + * OpenSCAD (www.openscad.org) + * Copyright (C) 2009-2011 Clifford Wolf <clifford@clifford.at> and + * Marius Kintel <marius@kintel.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -31,6 +32,13 @@ #include <QStack> #include <QFileInfo> #include <QDir> + +//isatty for visual c++ +#ifdef _MSC_VER +int __cdecl _isatty(int _FileHandle); +#define isatty _isatty +#endif + QString* stringcontents; int lexerget_lineno(void); #ifdef __GNUC__ |