rusefi
/
lua
mirror of https://github.com/rusefi/lua.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

detail (changing some names of macros)

This commit is contained in:
Roberto Ierusalimschy 2013-10-07 11:20:31 -03:00
parent 4c6dfc342b
commit c5fcba1a17
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
loadlib.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: loadlib.c,v 1.110 2012/04/26 19:38:52 roberto Exp roberto $ ** $Id: loadlib.c,v 1.111 2012/05/30 12:33:44 roberto Exp roberto $
** Dynamic library loader for Lua ** Dynamic library loader for Lua
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
** **
@ -31,21 +31,21 @@
/* /*
** LUA_PATH and LUA_CPATH are the names of the environment ** LUA_PATH_VAR and LUA_CPATH_VAR are the names of the environment
** variables that Lua check to set its paths. ** variables that Lua check to set its paths.
*/ */
#if !defined(LUA_PATH) #if !defined(LUA_PATH_VAR)
#define LUA_PATH "LUA_PATH" #define LUA_PATH_VAR "LUA_PATH"
#endif #endif
#if !defined(LUA_CPATH) #if !defined(LUA_CPATH_VAR)
#define LUA_CPATH "LUA_CPATH" #define LUA_CPATH_VAR "LUA_CPATH"
#endif #endif
#define LUA_PATHSUFFIX "_" LUA_VERSION_MAJOR "_" LUA_VERSION_MINOR #define LUA_PATHSUFFIX "_" LUA_VERSION_MAJOR "_" LUA_VERSION_MINOR
#define LUA_PATHVERSION LUA_PATH LUA_PATHSUFFIX #define LUA_PATHVARVERSION LUA_PATH_VAR LUA_PATHSUFFIX
#define LUA_CPATHVERSION LUA_CPATH LUA_PATHSUFFIX #define LUA_CPATHVARVERSION LUA_CPATH_VAR LUA_PATHSUFFIX
/* /*
** LUA_PATH_SEP is the character that separates templates in a path. ** LUA_PATH_SEP is the character that separates templates in a path.
@ -703,9 +703,9 @@ LUAMOD_API int luaopen_package (lua_State *L) {
#endif #endif
lua_setfield(L, -2, "searchers"); /* put it in field 'searchers' */ lua_setfield(L, -2, "searchers"); /* put it in field 'searchers' */
/* set field 'path' */ /* set field 'path' */
setpath(L, "path", LUA_PATHVERSION, LUA_PATH, LUA_PATH_DEFAULT); setpath(L, "path", LUA_PATHVARVERSION, LUA_PATH_VAR, LUA_PATH_DEFAULT);
/* set field 'cpath' */ /* set field 'cpath' */
setpath(L, "cpath", LUA_CPATHVERSION, LUA_CPATH, LUA_CPATH_DEFAULT); setpath(L, "cpath", LUA_CPATHVARVERSION, LUA_CPATH_VAR, LUA_CPATH_DEFAULT);
/* store config information */ /* store config information */
lua_pushliteral(L, LUA_DIRSEP "\n" LUA_PATH_SEP "\n" LUA_PATH_MARK "\n" lua_pushliteral(L, LUA_DIRSEP "\n" LUA_PATH_SEP "\n" LUA_PATH_MARK "\n"
LUA_EXEC_DIR "\n" LUA_IGMARK "\n"); LUA_EXEC_DIR "\n" LUA_IGMARK "\n");

14
lua.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lua.c,v 1.205 2012/05/23 15:37:09 roberto Exp roberto $ ** $Id: lua.c,v 1.206 2012/09/29 20:07:06 roberto Exp roberto $
** Lua stand-alone interpreter ** Lua stand-alone interpreter
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -31,12 +31,12 @@
#define LUA_MAXINPUT 512 #define LUA_MAXINPUT 512
#endif #endif
#if !defined(LUA_INIT) #if !defined(LUA_INIT_VAR)
#define LUA_INIT "LUA_INIT" #define LUA_INIT_VAR "LUA_INIT"
#endif #endif
#define LUA_INITVERSION \ #define LUA_INITVARVERSION \
LUA_INIT "_" LUA_VERSION_MAJOR "_" LUA_VERSION_MINOR LUA_INIT_VAR "_" LUA_VERSION_MAJOR "_" LUA_VERSION_MINOR
/* /*
@ -421,10 +421,10 @@ static int runargs (lua_State *L, char **argv, int n) {
static int handle_luainit (lua_State *L) { static int handle_luainit (lua_State *L) {
const char *name = "=" LUA_INITVERSION; const char *name = "=" LUA_INITVARVERSION;
const char *init = getenv(name + 1); const char *init = getenv(name + 1);
if (init == NULL) { if (init == NULL) {
name = "=" LUA_INIT; name = "=" LUA_INIT_VAR;
init = getenv(name + 1); /* try alternative name */ init = getenv(name + 1); /* try alternative name */
} }
if (init == NULL) return LUA_OK; if (init == NULL) return LUA_OK;