[Scummvm-git-logs] scummvm master -> 319a993592a74b649e738500054558beec9662af

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
319a993592 DIRECTOR: Lingo: Properly fix compilation on Dreamcast


Commit: 319a993592a74b649e738500054558beec9662af
    https://github.com/scummvm/scummvm/commit/319a993592a74b649e738500054558beec9662af
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-01-06T19:34:56+01:00

Commit Message:
DIRECTOR: Lingo: Properly fix compilation on Dreamcast

It should originally go to lingo-lex.l, as lingo-lex.cpp is
autogenerated. The fix was initially in 0da273fc8c843a6248e11f

Changed paths:
    engines/director/lingo/lingo-lex.cpp
    engines/director/lingo/lingo-lex.l


diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp
index 2bc3133..009ae8f 100644
--- a/engines/director/lingo/lingo-lex.cpp
+++ b/engines/director/lingo/lingo-lex.cpp
@@ -687,12 +687,12 @@ static void count() {
 	g_lingo->_colnumber += strlen(yytext);
 }
 
-#if defined(__PLAYSTATION2__) || defined(_MSC_VER)
+#if defined(__PLAYSTATION2__) || defined(_MSC_VER) || defined(__DC__)
 // Stub for missing function
 int isatty(int fileno) { return 0; }
 #endif
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__DC__)
 #define YY_NO_UNISTD_H
 #endif
 
diff --git a/engines/director/lingo/lingo-lex.l b/engines/director/lingo/lingo-lex.l
index 39aef99..e7d3a84 100644
--- a/engines/director/lingo/lingo-lex.l
+++ b/engines/director/lingo/lingo-lex.l
@@ -37,12 +37,12 @@ static void count() {
 	g_lingo->_colnumber += strlen(yytext);
 }
 
-#if defined(__PLAYSTATION2__) || defined(_MSC_VER)
+#if defined(__PLAYSTATION2__) || defined(_MSC_VER) || defined(__DC__)
 // Stub for missing function
 int isatty(int fileno) { return 0; }
 #endif
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__DC__)
 #define YY_NO_UNISTD_H
 #endif