diff --git a/liolib.c b/liolib.c index 9aa71b68..0927d7c0 100644 --- a/liolib.c +++ b/liolib.c @@ -1,5 +1,5 @@ /* -** $Id: liolib.c,v 2.136 2014/10/22 16:55:57 roberto Exp roberto $ +** $Id: liolib.c,v 2.137 2014/10/25 11:50:46 roberto Exp roberto $ ** Standard I/O (and system) library ** See Copyright Notice in lua.h */ @@ -60,7 +60,7 @@ #define l_popen(L,c,m) (fflush(NULL), popen(c,m)) #define l_pclose(L,file) (pclose(file)) -#elif defined(LUA_WIN) /* }{ */ +#elif defined(LUA_USE_WINDOWS) /* }{ */ #define l_popen(L,c,m) (_popen(c,m)) #define l_pclose(L,file) (_pclose(file)) @@ -112,7 +112,7 @@ #define l_ftell(f) ftello(f) #define l_seeknum off_t -#elif defined(LUA_WIN) && !defined(_CRTIMP_TYPEINFO) \ +#elif defined(LUA_USE_WINDOWS) && !defined(_CRTIMP_TYPEINFO) \ && defined(_MSC_VER) && (_MSC_VER >= 1400) /* }{ */ /* Windows (but not DDK) and Visual C++ 2005 or higher */ diff --git a/lua.c b/lua.c index 5838ef72..99aabfac 100644 --- a/lua.c +++ b/lua.c @@ -1,5 +1,5 @@ /* -** $Id: lua.c,v 1.217 2014/10/20 22:21:05 roberto Exp roberto $ +** $Id: lua.c,v 1.218 2014/10/29 16:11:17 roberto Exp roberto $ ** Lua stand-alone interpreter ** See Copyright Notice in lua.h */ @@ -50,7 +50,7 @@ #include #define lua_stdin_is_tty() isatty(0) -#elif defined(LUA_WIN) /* }{ */ +#elif defined(LUA_USE_WINDOWS) /* }{ */ #include #define lua_stdin_is_tty() _isatty(_fileno(stdin))