[Scummvm-cvs-logs] scummvm master -> b74ec1df8938668b67d54dab44d0a1f96e9de490

[dreammaster]

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:
b74ec1df89 DIRECTOR: Fix compilation in Visual Studio


Commit: b74ec1df8938668b67d54dab44d0a1f96e9de490
    https://github.com/scummvm/scummvm/commit/b74ec1df8938668b67d54dab44d0a1f96e9de490
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-08-04T21:07:59-04:00

Commit Message:
DIRECTOR: Fix compilation in Visual Studio

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



diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp
index 813510a..e503a47 100644
--- a/engines/director/lingo/lingo-lex.cpp
+++ b/engines/director/lingo/lingo-lex.cpp
@@ -685,7 +685,7 @@ static void count() {
 	g_lingo->_colnumber += strlen(yytext);
 }
 
-#ifdef __PLAYSTATION2__
+#if defined(__PLAYSTATION2__) || defined(_MSC_VER)
 // Stub for missing function
 int isatty(int fileno) { return 0; }
 #endif
@@ -704,6 +704,10 @@ static void countnl() {
 
 #define INITIAL 0
 
+#ifdef _MSC_VER
+#define YY_NO_UNISTD_H
+#endif
+
 #ifndef YY_NO_UNISTD_H
 /* Special case for "unistd.h", since it is non-ANSI. We include it way
  * down here because we want the user's section 1 to have been scanned first.