diff options
| author | Marius Kintel <marius@kintel.net> | 2011-08-04 02:02:42 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-08-04 02:02:42 (GMT) |
| commit | 2af5648eda19ef006715d02c8a917229824ba5a8 (patch) | |
| tree | b1b727198ae1d68d21c5936fcf99d8231b43fe88 /src/lexer.l | |
| parent | c65a3f5d743a75b1e4adc0da46b13a2cf8998def (diff) | |
| parent | 00d7bb401c0732a5f1b33cd0059a643933286c5d (diff) | |
Merge branch 'master' into visitor
Conflicts:
src/OpenCSGRenderer.cc
src/csgops.cc
src/mainwin.cc
src/polyset.cc
src/projection.cc
Diffstat (limited to 'src/lexer.l')
| -rw-r--r-- | src/lexer.l | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lexer.l b/src/lexer.l index bc61c20..5e62b19 100644 --- a/src/lexer.l +++ b/src/lexer.l @@ -35,7 +35,7 @@ //isatty for visual c++ #ifdef _MSC_VER -int __cdecl _isatty(int _FileHandle); +extern "C" int __cdecl _isatty(int _FileHandle); #define isatty _isatty #endif |