more symbol collision fixes but this time for some missed extern cons…

…t symbols
joehinkle11 · May 28, 2022 · 60a5ad3 · 60a5ad3
1 parent 6767072
commit 60a5ad3
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/Sources/lua-5.4.4/src/include/lctype.h b/Sources/lua-5.4.4/src/include/lctype.h
@@ -49,7 +49,7 @@
 /*
 ** add 1 to char to allow index -1 (EOZ)
 */
-#define testprop(c,p)	(luai_ctype_[(c)+1] & (p))
+#define testprop(c,p)	(luai_ctype__5_4_4[(c)+1] & (p))
 
 /*
 ** 'lalpha' (Lua alphabetic) and 'lalnum' (Lua alphanumeric) both include '_'
@@ -74,7 +74,7 @@
 
 
 /* one entry for each character and for -1 (EOZ) */
-LUAI_DDEC(const lu_byte luai_ctype_[UCHAR_MAX + 2];)
+LUAI_DDEC(const lu_byte luai_ctype__5_4_4[UCHAR_MAX + 2];)
 
 
 #else			/* }{ */

diff --git a/Sources/lua-5.4.4/src/include/lopcodes.h b/Sources/lua-5.4.4/src/include/lopcodes.h
@@ -378,14 +378,14 @@ OP_EXTRAARG/*	Ax	extra (larger) argument for previous opcode	*/
 ** bit 7: instruction is an MM instruction (call a metamethod)
 */
 
-LUAI_DDEC(const lu_byte luaP_opmodes[NUM_OPCODES];)
-
-#define getOpMode(m)	(cast(enum OpMode, luaP_opmodes[m] & 7))
-#define testAMode(m)	(luaP_opmodes[m] & (1 << 3))
-#define testTMode(m)	(luaP_opmodes[m] & (1 << 4))
-#define testITMode(m)	(luaP_opmodes[m] & (1 << 5))
-#define testOTMode(m)	(luaP_opmodes[m] & (1 << 6))
-#define testMMMode(m)	(luaP_opmodes[m] & (1 << 7))
+LUAI_DDEC(const lu_byte luaP_opmodes_5_4_4[NUM_OPCODES];)
+
+#define getOpMode(m)	(cast(enum OpMode, luaP_opmodes_5_4_4[m] & 7))
+#define testAMode(m)	(luaP_opmodes_5_4_4[m] & (1 << 3))
+#define testTMode(m)	(luaP_opmodes_5_4_4[m] & (1 << 4))
+#define testITMode(m)	(luaP_opmodes_5_4_4[m] & (1 << 5))
+#define testOTMode(m)	(luaP_opmodes_5_4_4[m] & (1 << 6))
+#define testMMMode(m)	(luaP_opmodes_5_4_4[m] & (1 << 7))
 
 /* "out top" (set top for next instruction) */
 #define isOT(i)  \

diff --git a/Sources/lua-5.4.4/src/include/ltm.h b/Sources/lua-5.4.4/src/include/ltm.h
@@ -66,9 +66,9 @@ typedef enum {
 
 #define fasttm(l,et,e)	gfasttm(G(l), et, e)
 
-#define ttypename(x)	luaT_typenames_[(x) + 1]
+#define ttypename(x)	luaT_typenames__5_4_4[(x) + 1]
 
-LUAI_DDEC(const char *const luaT_typenames_[LUA_TOTALTYPES];)
+LUAI_DDEC(const char *const luaT_typenames__5_4_4[LUA_TOTALTYPES];)
 
 
 LUAI_FUNC const char *luaT_objtypename (lua_State *L, const TValue *o);

diff --git a/Sources/lua-5.4.4/src/include/lua.h b/Sources/lua-5.4.4/src/include/lua.h
@@ -144,7 +144,7 @@ typedef void (*lua_WarnFunction) (void *ud, const char *msg, int tocont);
 /*
 ** RCS ident string
 */
-extern const char lua_ident[];
+extern const char lua_ident_5_4_4[];
 
 
 /*

diff --git a/Sources/lua-5.4.4/src/lapi.cpp b/Sources/lua-5.4.4/src/lapi.cpp
@@ -32,7 +32,7 @@
 
 
 
-const char lua_ident[] =
+const char lua_ident_5_4_4[] =
   "$LuaVersion: " LUA_COPYRIGHT " $"
   "$LuaAuthors: " LUA_AUTHORS " $";
 

diff --git a/Sources/lua-5.4.4/src/lctype.cpp b/Sources/lua-5.4.4/src/lctype.cpp
@@ -25,7 +25,7 @@
 #endif
 
 
-LUAI_DDEF const lu_byte luai_ctype_[UCHAR_MAX + 2] = {
+LUAI_DDEF const lu_byte luai_ctype__5_4_4[UCHAR_MAX + 2] = {
   0x00,  /* EOZ */
   0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* 0. */
   0x00,  0x08,  0x08,  0x08,  0x08,  0x08,  0x00,  0x00,

diff --git a/Sources/lua-5.4.4/src/lopcodes.cpp b/Sources/lua-5.4.4/src/lopcodes.cpp
@@ -15,7 +15,7 @@
 
 /* ORDER OP */
 
-LUAI_DDEF const lu_byte luaP_opmodes[NUM_OPCODES] = {
+LUAI_DDEF const lu_byte luaP_opmodes_5_4_4[NUM_OPCODES] = {
 /*       MM OT IT T  A  mode		   opcode  */
   opmode(0, 0, 0, 0, 1, iABC)		/* OP_MOVE */
  ,opmode(0, 0, 0, 0, 1, iAsBx)		/* OP_LOADI */

diff --git a/Sources/lua-5.4.4/src/ltm.cpp b/Sources/lua-5.4.4/src/ltm.cpp
@@ -27,7 +27,7 @@
 
 static const char udatatypename[] = "userdata";
 
-LUAI_DDEF const char *const luaT_typenames_[LUA_TOTALTYPES] = {
+LUAI_DDEF const char *const luaT_typenames__5_4_4[LUA_TOTALTYPES] = {
   "no value",
   "nil", "boolean", udatatypename, "number",
   "string", "table", "function", udatatypename, "thread",