From 0897c0a4289ef3a8d45761266124613f364bef60 Mon Sep 17 00:00:00 2001 From: Roberto Ierusalimschy Date: Mon, 8 Apr 2024 14:28:26 -0300 Subject: 'getmode' renamed to 'getMode' The name 'getmode' conficts with a function from BSD, defined in . Although 'lbaselib.c' cannot include that header, 'onelua.c' can. --- lbaselib.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lbaselib.c b/lbaselib.c index 4238f96a..b2da6a77 100644 --- a/lbaselib.c +++ b/lbaselib.c @@ -336,7 +336,7 @@ static int load_aux (lua_State *L, int status, int envidx) { } -static const char *getmode (lua_State *L, int idx) { +static const char *getMode (lua_State *L, int idx) { const char *mode = luaL_optstring(L, idx, "bt"); if (strchr(mode, 'B') != NULL) /* Lua code cannot use fixed buffers */ luaL_argerror(L, idx, "invalid mode"); @@ -346,7 +346,7 @@ static const char *getmode (lua_State *L, int idx) { static int luaB_loadfile (lua_State *L) { const char *fname = luaL_optstring(L, 1, NULL); - const char *mode = getmode(L, 2); + const char *mode = getMode(L, 2); int env = (!lua_isnone(L, 3) ? 3 : 0); /* 'env' index or 0 if no 'env' */ int status = luaL_loadfilex(L, fname, mode); return load_aux(L, status, env); @@ -395,7 +395,7 @@ static int luaB_load (lua_State *L) { int status; size_t l; const char *s = lua_tolstring(L, 1, &l); - const char *mode = getmode(L, 3); + const char *mode = getMode(L, 3); int env = (!lua_isnone(L, 4) ? 4 : 0); /* 'env' index or 0 if no 'env' */ if (s != NULL) { /* loading a string? */ const char *chunkname = luaL_optstring(L, 2, s); -- cgit v1.2.3-55-g6feb