From 4713b258376da8120a27aa7422e3ab9cbcfa7f3c Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Wed, 16 Dec 2020 08:41:58 -0800
Subject: [PATCH] Bit array conflicts
---
src/lua_hooklib.c | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/src/lua_hooklib.c b/src/lua_hooklib.c
index 3a63e446e5..7f5e3dc96c 100644
--- a/src/lua_hooklib.c
+++ b/src/lua_hooklib.c
@@ -38,18 +38,6 @@ static const char * const stringHookNames[] = {
STRING_HOOK_LIST (TOSTR) NULL
};
-/* TODO: remove when doomtype version is merged */
-
-#define BIT_ARRAY_LENGTH(n) (((n) + 7) >> 3)
-
-static inline void set_bit_array (UINT8 *array, const int n) {
- array[n >> 3] |= 1 << (n & 7);
-}
-
-static inline int in_bit_array (const UINT8 *array, const int n) {
- return array[n >> 3] & (1 << (n & 7));
-}
-
typedef struct {
int numHooks;
int *ids;
@@ -215,7 +203,7 @@ static int lib_addHook(lua_State *L)
if (!(nextid & 7))
{
Z_Realloc(hooksErrored,
- BIT_ARRAY_LENGTH (nextid + 1) * sizeof *hooksErrored,
+ BIT_ARRAY_SIZE (nextid + 1) * sizeof *hooksErrored,
PU_STATIC, &hooksErrored);
hooksErrored[nextid >> 3] = 0;
}
--
GitLab