diff options
| author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2014-10-31 13:54:06 -0200 |
|---|---|---|
| committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2014-10-31 13:54:06 -0200 |
| commit | 1a69a3eceab706f3b83abd41507aba1d969aaf4f (patch) | |
| tree | 5387c20fd986b5fd356892cf4983aaa28ce572d2 | |
| parent | dcfc3c9405fac62c5808c33e1b4c82c45c5b2218 (diff) | |
| download | lua-1a69a3eceab706f3b83abd41507aba1d969aaf4f.tar.gz lua-1a69a3eceab706f3b83abd41507aba1d969aaf4f.tar.bz2 lua-1a69a3eceab706f3b83abd41507aba1d969aaf4f.zip | |
LUA_WIN -> LUA_USE_WINDOWS
| -rw-r--r-- | liolib.c | 6 | ||||
| -rw-r--r-- | lua.c | 4 |
2 files changed, 5 insertions, 5 deletions
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: liolib.c,v 2.136 2014/10/22 16:55:57 roberto Exp roberto $ | 2 | ** $Id: liolib.c,v 2.137 2014/10/25 11:50:46 roberto Exp roberto $ |
| 3 | ** Standard I/O (and system) library | 3 | ** Standard I/O (and system) library |
| 4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
| 5 | */ | 5 | */ |
| @@ -60,7 +60,7 @@ | |||
| 60 | #define l_popen(L,c,m) (fflush(NULL), popen(c,m)) | 60 | #define l_popen(L,c,m) (fflush(NULL), popen(c,m)) |
| 61 | #define l_pclose(L,file) (pclose(file)) | 61 | #define l_pclose(L,file) (pclose(file)) |
| 62 | 62 | ||
| 63 | #elif defined(LUA_WIN) /* }{ */ | 63 | #elif defined(LUA_USE_WINDOWS) /* }{ */ |
| 64 | 64 | ||
| 65 | #define l_popen(L,c,m) (_popen(c,m)) | 65 | #define l_popen(L,c,m) (_popen(c,m)) |
| 66 | #define l_pclose(L,file) (_pclose(file)) | 66 | #define l_pclose(L,file) (_pclose(file)) |
| @@ -112,7 +112,7 @@ | |||
| 112 | #define l_ftell(f) ftello(f) | 112 | #define l_ftell(f) ftello(f) |
| 113 | #define l_seeknum off_t | 113 | #define l_seeknum off_t |
| 114 | 114 | ||
| 115 | #elif defined(LUA_WIN) && !defined(_CRTIMP_TYPEINFO) \ | 115 | #elif defined(LUA_USE_WINDOWS) && !defined(_CRTIMP_TYPEINFO) \ |
| 116 | && defined(_MSC_VER) && (_MSC_VER >= 1400) /* }{ */ | 116 | && defined(_MSC_VER) && (_MSC_VER >= 1400) /* }{ */ |
| 117 | 117 | ||
| 118 | /* Windows (but not DDK) and Visual C++ 2005 or higher */ | 118 | /* Windows (but not DDK) and Visual C++ 2005 or higher */ |
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: lua.c,v 1.217 2014/10/20 22:21:05 roberto Exp roberto $ | 2 | ** $Id: lua.c,v 1.218 2014/10/29 16:11:17 roberto Exp roberto $ |
| 3 | ** Lua stand-alone interpreter | 3 | ** Lua stand-alone interpreter |
| 4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
| 5 | */ | 5 | */ |
| @@ -50,7 +50,7 @@ | |||
| 50 | #include <unistd.h> | 50 | #include <unistd.h> |
| 51 | #define lua_stdin_is_tty() isatty(0) | 51 | #define lua_stdin_is_tty() isatty(0) |
| 52 | 52 | ||
| 53 | #elif defined(LUA_WIN) /* }{ */ | 53 | #elif defined(LUA_USE_WINDOWS) /* }{ */ |
| 54 | 54 | ||
| 55 | #include <io.h> | 55 | #include <io.h> |
| 56 | #define lua_stdin_is_tty() _isatty(_fileno(stdin)) | 56 | #define lua_stdin_is_tty() _isatty(_fileno(stdin)) |
