diff options
| author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2016-12-13 13:50:58 -0200 |
|---|---|---|
| committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2016-12-13 13:50:58 -0200 |
| commit | 9f594ca6f54483509e39bbb4054e0ca01961e1e8 (patch) | |
| tree | 2de377171720aab37ac54225ee9b3f731c51a6cc | |
| parent | 4df4560bf599e853ab946a0e5abf47c910a5a6cf (diff) | |
| download | lua-9f594ca6f54483509e39bbb4054e0ca01961e1e8.tar.gz lua-9f594ca6f54483509e39bbb4054e0ca01961e1e8.tar.bz2 lua-9f594ca6f54483509e39bbb4054e0ca01961e1e8.zip | |
LUA_PATHSUFFIX -> LUA_VERSUFFIX + LUA_VERSUFFIX used in the
definition of LUA_INITVARVERSION, too.
| -rw-r--r-- | lua.c | 14 |
1 files changed, 7 insertions, 7 deletions
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: lua.c,v 1.226 2015/08/14 19:11:20 roberto Exp roberto $ | 2 | ** $Id: lua.c,v 1.227 2016/07/18 17:55:59 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 | */ |
| @@ -20,6 +20,9 @@ | |||
| 20 | #include "lualib.h" | 20 | #include "lualib.h" |
| 21 | 21 | ||
| 22 | 22 | ||
| 23 | #define LUA_VERSUFFIX "_" LUA_VERSION_MAJOR "_" LUA_VERSION_MINOR | ||
| 24 | |||
| 25 | |||
| 23 | #if !defined(LUA_PROMPT) | 26 | #if !defined(LUA_PROMPT) |
| 24 | #define LUA_PROMPT "> " | 27 | #define LUA_PROMPT "> " |
| 25 | #define LUA_PROMPT2 ">> " | 28 | #define LUA_PROMPT2 ">> " |
| @@ -37,8 +40,7 @@ | |||
| 37 | #define LUA_INIT_VAR "LUA_INIT" | 40 | #define LUA_INIT_VAR "LUA_INIT" |
| 38 | #endif | 41 | #endif |
| 39 | 42 | ||
| 40 | #define LUA_INITVARVERSION \ | 43 | #define LUA_INITVARVERSION LUA_INIT_VAR LUA_VERSUFFIX |
| 41 | LUA_INIT_VAR "_" LUA_VERSION_MAJOR "_" LUA_VERSION_MINOR | ||
| 42 | 44 | ||
| 43 | 45 | ||
| 44 | /* | 46 | /* |
| @@ -550,10 +552,8 @@ static int runargs (lua_State *L, char **argv, int n) { | |||
| 550 | #define LUA_CPATH_VAR "LUA_CPATH" | 552 | #define LUA_CPATH_VAR "LUA_CPATH" |
| 551 | #endif | 553 | #endif |
| 552 | 554 | ||
| 553 | #define LUA_PATHSUFFIX "_" LUA_VERSION_MAJOR "_" LUA_VERSION_MINOR | 555 | #define LUA_PATHVARVERSION LUA_PATH_VAR LUA_VERSUFFIX |
| 554 | 556 | #define LUA_CPATHVARVERSION LUA_CPATH_VAR LUA_VERSUFFIX | |
| 555 | #define LUA_PATHVARVERSION LUA_PATH_VAR LUA_PATHSUFFIX | ||
| 556 | #define LUA_CPATHVARVERSION LUA_CPATH_VAR LUA_PATHSUFFIX | ||
| 557 | 557 | ||
| 558 | 558 | ||
| 559 | #define AUXMARK "\1" /* auxiliary mark */ | 559 | #define AUXMARK "\1" /* auxiliary mark */ |
